Remove old hack of creating a .a file with code that existed both in rust
and on newer versions of llvm.
This commit is contained in:
parent
758c11b22c
commit
01675f34e0
|
@ -2,39 +2,22 @@
|
||||||
# rustc LLVM-extensions (C++) library variables and rules
|
# rustc LLVM-extensions (C++) library variables and rules
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
RUSTLLVM_LIB_CS := $(addprefix rustllvm/, Passes.cpp)
|
RUSTLLVM_OBJS_CS := $(addprefix rustllvm/, Passes.cpp RustWrapper.cpp)
|
||||||
|
|
||||||
RUSTLLVM_OBJS_CS := $(addprefix rustllvm/, RustWrapper.cpp)
|
|
||||||
|
|
||||||
RUSTLLVM_DEF := rustllvm/rustllvm$(CFG_DEF_SUFFIX)
|
RUSTLLVM_DEF := rustllvm/rustllvm$(CFG_DEF_SUFFIX)
|
||||||
|
|
||||||
RUSTLLVM_INCS := -iquote $(CFG_LLVM_INCDIR) \
|
RUSTLLVM_INCS := -iquote $(CFG_LLVM_INCDIR) \
|
||||||
-iquote $(S)src/rustllvm/include
|
-iquote $(S)src/rustllvm/include
|
||||||
RUSTLLVM_LIB_OBJS := $(RUSTLLVM_LIB_CS:.cpp=.o)
|
|
||||||
RUSTLLVM_OBJS_OBJS := $(RUSTLLVM_OBJS_CS:.cpp=.o)
|
RUSTLLVM_OBJS_OBJS := $(RUSTLLVM_OBJS_CS:.cpp=.o)
|
||||||
|
|
||||||
|
rustllvm/$(CFG_RUSTLLVM): $(RUSTLLVM_OBJS_OBJS) \
|
||||||
# FIXME: Building a .a is a hack so that we build with both older and newer
|
|
||||||
# versions of LLVM. In newer versions some of the bits of this library are
|
|
||||||
# already in LLVM itself, so they are skipped.
|
|
||||||
rustllvm/rustllvmbits.a: $(RUSTLLVM_LIB_OBJS)
|
|
||||||
@$(call E, archive: $@)
|
|
||||||
$(Q)rm -f $@
|
|
||||||
$(Q)$(CFG_GCCISH_CROSS)ar crs $@ $^
|
|
||||||
$(Q)$(CFG_GCCISH_CROSS)ranlib $@
|
|
||||||
|
|
||||||
# Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
|
|
||||||
# it has no -whole-archive.
|
|
||||||
rustllvm/$(CFG_RUSTLLVM): rustllvm/rustllvmbits.a $(RUSTLLVM_OBJS_OBJS) \
|
|
||||||
$(MKFILES) $(RUSTLLVM_DEF)
|
$(MKFILES) $(RUSTLLVM_DEF)
|
||||||
@$(call E, link: $@)
|
@$(call E, link: $@)
|
||||||
$(Q)$(call CFG_LINK_C,$@,$(RUSTLLVM_OBJS_OBJS) \
|
$(Q)$(call CFG_LINK_C,$@,$(RUSTLLVM_OBJS_OBJS) \
|
||||||
$(CFG_GCCISH_PRE_LIB_FLAGS) $(CFG_LLVM_LIBS) \
|
$(CFG_GCCISH_PRE_LIB_FLAGS) $(CFG_LLVM_LIBS) \
|
||||||
$(CFG_GCCISH_POST_LIB_FLAGS) rustllvm/rustllvmbits.a \
|
$(CFG_GCCISH_POST_LIB_FLAGS) \
|
||||||
$(CFG_LLVM_LIBS) \
|
|
||||||
$(CFG_LLVM_LDFLAGS),$(RUSTLLVM_DEF))
|
$(CFG_LLVM_LDFLAGS),$(RUSTLLVM_DEF))
|
||||||
|
|
||||||
|
|
||||||
rustllvm/%.o: rustllvm/%.cpp $(MKFILES)
|
rustllvm/%.o: rustllvm/%.cpp $(MKFILES)
|
||||||
@$(call E, compile: $@)
|
@$(call E, compile: $@)
|
||||||
$(Q)$(call CFG_COMPILE_C, $@, $(CFG_LLVM_CXXFLAGS) $(RUSTLLVM_INCS)) $<
|
$(Q)$(call CFG_COMPILE_C, $@, $(CFG_LLVM_CXXFLAGS) $(RUSTLLVM_INCS)) $<
|
||||||
|
|
Loading…
Reference in New Issue