For PR432:

* Use new configuration variables to compute LLVMGCC and LLVMGXX variables.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19094 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.config.in b/Makefile.config.in
index 9f6215c5065c7ff07b9d3191e76b3286f8af9da1..ee77f879c5d1aeaae34b21d7ece5780cb131991f 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -94,22 +94,25 @@ ZIP        := @ZIP@
 # Paths to miscellaneous programs we assume are present
 RPWD       := pwd
 ECHO       := echo
+
+# Path to location for LLVM C/C++ front-end. You can modify this if you
+# want to override the value set by configure.
+LLVMGCCDIR := @LLVMGCCDIR@
+
 # Determine the target for which LLVM should generate code.
 LLVMGCCARCH := @target@/3.4-llvm
 
 # Full pathnames of LLVM C/C++ front-end 'cc1' and 'cc1plus' binaries:
-LCC1 = @LLVMCC1@
-LCC1XX = @LLVMCC1PLUS@
+LLVMGCC  := @LLVMGCC@
+LLVMGXX  := @LLVMGXX@
+LLVMCC1  := @LLVMCC1@
+LLVMCC1PLUS := @LLVMCC1PLUS@
 
 # Path to directory where object files should be stored during a build.
 # Set OBJ_ROOT to "." if you do not want to use a separate place for
 # object files.
 OBJ_ROOT := .
 
-# Path to location for LLVM C/C++ front-end. You can modify this if you
-# want to override the value set by configure.
-LLVMGCCDIR := @LLVMGCCDIR@
-
 # These are options that can either be enabled here, or can be enabled on the
 # make command line (ie, make ENABLE_PROFILING=1):
 
@@ -203,7 +206,6 @@ sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@ 
 localstatedir = @localstatedir@
 libdir = @libdir@
-cferuntime_libdir = $(LLVMGCCDIR)/lib
 includedir = @includedir@
 infodir = @infodir@
 mandir = @mandir@