diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-12-10 04:56:38 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-12-10 04:56:38 +0000 |
| commit | 4413672aa51f66bca1c71ba663cddff6f13abb04 (patch) | |
| tree | e5ebd2b2fbbe8bd56eeb5c758d063af08b5f693d /Makefile.rules | |
| parent | 281722dab8b89e0956136aa38ac8314cd2f42ff6 (diff) | |
| download | external_llvm-4413672aa51f66bca1c71ba663cddff6f13abb04.zip external_llvm-4413672aa51f66bca1c71ba663cddff6f13abb04.tar.gz external_llvm-4413672aa51f66bca1c71ba663cddff6f13abb04.tar.bz2 | |
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
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.rules b/Makefile.rules index b349b22..6fca99f 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 $@ |