From 4413672aa51f66bca1c71ba663cddff6f13abb04 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Sun, 10 Dec 2006 04:56:38 +0000 Subject: [PATCH] Don't bother with setting the path before running llvm-gcc4, it doesn't need it like llvm-gcc3 did. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32410 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index b349b2226c9..6fca99f001f 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -326,14 +326,15 @@ endif ifeq ($(LLVMGCC_MAJVERS),3) UPGRADE_MSG = $(Echo) "Upgrading $(1) assembly to latest." UPGRADE_LL = $(Verb)$(LUPGRADE) $(1) -o $(1).up.tmp -f ; $(MV) $(1).up.tmp $(1) +LLVMGCCWITHPATH := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGCC) +LLVMGXXWITHPATH := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGXX) else UPGRADE_MSG = UPGRADE_LL = +LLVMGCCWITHPATH := $(LLVMGCC) +LLVMGXXWITHPATH := $(LLVMGXX) endif -LLVMGCCWITHPATH := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGCC) -LLVMGXXWITHPATH := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGXX) - #-------------------------------------------------------------------- # Adjust to user's request #-------------------------------------------------------------------- @@ -1104,7 +1105,7 @@ $(BuildMode)/%.ii: %.cc $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.cc for $(BuildMode) build to .ii file" $(Verb) $(Preprocess.CXX) $< -o $@ - $(BuildMode)/%.i: %.c $(ObjDir)/.dir $(BUILT_SOURCES) +$(BuildMode)/%.i: %.c $(ObjDir)/.dir $(BUILT_SOURCES) $(Echo) "Compiling $*.c for $(BuildMode) build to .i file" $(Verb) $(Preprocess.C) $< -o $@ -- 2.34.1