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
diff --git a/Makefile.rules b/Makefile.rules
index 90dec2c..3b72b18 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -313,7 +313,7 @@
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 @@
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