Kill off LLVMGCC_MAJVERS make variable.

[oota-llvm.git] / Makefile.config.in

diff --git a/Makefile.config.in b/Makefile.config.in
index 44296a466d272b233ab13a7b43449d2d8ac1e959..0fa41f7989be93980df778844f0e787d6fd6f22e 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -184,11 +184,7 @@ TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
 LLVMGCCDIR := @LLVMGCCDIR@
 
 # Determine the target for which LLVM should generate code.
-ifeq (@LLVMGCC_MAJVERS@,3)
-LLVMGCCARCH := @target@/3.4-llvm
-else
 LLVMGCCARCH := @target@/@LLVMGCC_VERSION@
-endif
 
 # Determine the path where the library executables are
 LLVMGCCLIBEXEC := @LLVMGCCLIBEXEC@
@@ -199,7 +195,6 @@ LLVMGXX  := @LLVMGXX@
 LLVMCC1  := @LLVMCC1@
 LLVMCC1PLUS := @LLVMCC1PLUS@
 LLVMGCC_VERSION := @LLVMGCC_VERSION@
-LLVMGCC_MAJVERS := @LLVMGCC_MAJVERS@
 LLVMGCC_LANGS := @LLVMGCC_LANGS@
 
 # Path to directory where object files should be stored during a build.
@@ -313,7 +308,7 @@ endif
 # Location of the plugin header file for gold.
 BINUTILS_INCDIR := @BINUTILS_INCDIR@
 
-C_INCLUDE_DIRS := @C_INCLUDE_DISR@
+C_INCLUDE_DIRS := @C_INCLUDE_DIRS@
 CXX_INCLUDE_ROOT := @CXX_INCLUDE_ROOT@
 CXX_INCLUDE_ARCH := @CXX_INCLUDE_ARCH@
 CXX_INCLUDE_32BIT_DIR = @CXX_INCLUDE_32BIT_DIR@