summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2007-02-09 17:09:14 +0000
committerReid Spencer <rspencer@reidspencer.com>2007-02-09 17:09:14 +0000
commit18464127a49836b1aec14964257466a944e58416 (patch)
treea05293ea5b14be29b9037a0a8f436db65b5fd7bf
parent36a987eed00886f6508668942df140fa053256ca (diff)
downloadllvm-18464127a49836b1aec14964257466a944e58416.tar.gz
llvm-18464127a49836b1aec14964257466a944e58416.tar.bz2
llvm-18464127a49836b1aec14964257466a944e58416.tar.xz
Fix some bugs in module building that broke llvm-stacker project.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34099 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile.rules6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 90dec2ccc4..3b72b183f6 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -313,7 +313,7 @@ ifndef TBLGEN
endif
LLVM_CONFIG := $(LLVMToolDir)/llvm-config
ifndef LLVMLD
-LLVMLD := $(LLVMToolDir)/gccld$(EXEEXT)
+LLVMLD := $(LLVMToolDir)/llvm-ld$(EXEEXT)
endif
ifndef LLVMDIS
LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT)
@@ -1181,12 +1181,12 @@ $(ObjDir)/%.s: %.c $(ObjDir)/.dir $(BUILT_SOURCES)
ifdef DEBUG_RUNTIME
$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(LLVMAS) $(LOPT)
$(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
- $(Verb) $(LLVMAS) $< -o - | $(LOPT) -std-compile-opts $< -o $@
+ $(Verb) $(LLVMAS) $< -o - | $(LOPT) -std-compile-opts -o $@ -f
else
$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(LLVMAS) $(LOPT)
$(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
$(Verb) $(LLVMAS) $< -o - | \
- $(LOPT) -std-compile-opts -strip-debug $< -o $@
+ $(LOPT) -std-compile-opts -strip-debug -o $@ -f
endif