[vmkit-commits] [vmkit] r181300 - Add the option to the configure '--with-clang-path=<path>' to set the path to clang and clang++

[Sylvestre Ledru]

Author: sylvestre
Date: Tue May  7 04:51:28 2013
New Revision: 181300

URL: http://llvm.org/viewvc/llvm-project?rev=181300&view=rev
Log:
Add the option to the configure '--with-clang-path=<path>' to set the path to clang and clang++


Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=181300&r1=181299&r2=181300&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Tue May  7 04:51:28 2013
@@ -62,8 +62,8 @@ WITH_64 = @WITH_64@
 ###############################################################################
 LLVM_CONFIG=@LLVM_CONFIG@
 LLVM_BIN=$(shell $(LLVM_CONFIG) --bindir)
-CLANG=$(LLVM_BIN)/clang
-CLANGXX=$(LLVM_BIN)/clang++
+CLANG=@CLANG_PATH@/clang
+CLANGXX=@CLANG_PATH@/clang++
 LLVMAS=$(LLVM_BIN)/llvm-as
 LLC=$(LLVM_BIN)/llc
 LOPT=$(LLVM_BIN)/opt

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=181300&r1=181299&r2=181300&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue May  7 04:51:28 2013
@@ -211,6 +211,17 @@ AC_ARG_WITH(llvm-config-path,
 )
 
 dnl **************************************************************************
+dnl clang
+dnl **************************************************************************
+AC_ARG_WITH(clang-path,
+       [AS_HELP_STRING(--with-clang-path=path,
+           [clang path (use default path)])],
+       [[CLANG_PATH=$withval]],
+       [[CLANG_PATH="$(LLVM_CONFIG) --bindir"]]
+)
+AC_SUBST([CLANG_PATH])
+
+dnl **************************************************************************
 dnl GC type 
 dnl **************************************************************************
 AC_ARG_WITH(mmtk-plan,

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=181300&r1=181299&r2=181300&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue May  7 04:51:28 2013
@@ -662,6 +662,7 @@ classpathlibs
 classpathglibj
 MMTK_PLAN
 GC_FLAGS
+CLANG_PATH
 ASSERT
 DEBUG
 OPTIMIZED
@@ -729,6 +730,7 @@ enable_optimized
 enable_debug
 enable_assert
 with_llvm_config_path
+with_clang_path
 with_mmtk_plan
 with_gnu_classpath_libs
 with_gnu_classpath_glibj
@@ -1371,6 +1373,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-llvm-config-path=path
                           llvm-config path (use default path)
+  --with-clang-path=path  clang path (use default path)
   --with-mmtk-plan=something
                           MMTk plan type ('org.mmtk.plan.marksweep.MS')
   --with-gnu-classpath-libs=something
@@ -2544,6 +2547,17 @@ fi
 
 
 
+# Check whether --with-clang-path was given.
+if test "${with_clang_path+set}" = set; then :
+  withval=$with_clang_path; CLANG_PATH=$withval
+else
+  CLANG_PATH="$(LLVM_CONFIG) --bindir"
+
+fi
+
+
+
+
 # Check whether --with-mmtk-plan was given.
 if test "${with_mmtk_plan+set}" = set; then :
   withval=$with_mmtk_plan; MMTK_PLAN=$withval