diff options
| author | Patrick Walton <[email protected]> | 2011-03-21 18:05:34 -0700 |
|---|---|---|
| committer | Patrick Walton <[email protected]> | 2011-03-21 18:05:34 -0700 |
| commit | e6d3308eb60c0ec419a2487a574b4ec501d8784d (patch) | |
| tree | a205e274f35fdade534bebe3db84a9679ae88220 | |
| parent | Change llvmext.dll to rustllvm.dll in the new build system to match the def file (diff) | |
| download | rust-e6d3308eb60c0ec419a2487a574b4ec501d8784d.tar.xz rust-e6d3308eb60c0ec419a2487a574b4ec501d8784d.zip | |
Add .def file support to the new build system (which does nothing at the moment since I don't know how to use .defs on MinGW)
| -rw-r--r-- | Makefile.in | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 7cf5e576..c749a8b4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -311,6 +311,7 @@ RUNTIME_HDR := rt/globals.h \ rt/test/rust_test_runtime.h \ rt/test/rust_test_util.h +RUNTIME_DEF := $(S)src/rt/rustrt.def RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o) @@ -322,6 +323,7 @@ LLVMEXT_CS := $(addprefix llvmext/, \ MachOObjectFile.cpp Object.cpp RustWrapper.cpp) LLVMEXT_HDR := llvmext/include/llvm-c/Object.h +LLVMEXT_DEF := $(S)src/llvmext/rustllvm.def LLVMEXT_INCS := -iquote $(CFG_LLVM_INCDIR) \ -iquote $(S)src/llvmext/include @@ -365,14 +367,15 @@ all: boot/rustboot$(X) \ stage0/$(CFG_STDLIB) \ $(GENERATED) -rt/$(CFG_RUNTIME): $(RUNTIME_OBJS) $(MKFILES) $(RUNTIME_HDR) +rt/$(CFG_RUNTIME): $(RUNTIME_OBJS) $(MKFILES) $(RUNTIME_HDR) $(RUNTIME_DEF) @$(call E, link: $@) - $(Q)$(call CFG_LINK_C, $@) $(RUNTIME_OBJS) + $(Q)$(call CFG_LINK_C,$@,$(RUNTIME_OBJS),$(RUNTIME_DEF)) -llvmext/$(CFG_LLVMEXT): $(LLVMEXT_OBJS) $(MKFILES) $(LLVMEXT_HDR) +llvmext/$(CFG_LLVMEXT): $(LLVMEXT_OBJS) $(MKFILES) $(LLVMEXT_HDR) \ + $(LLVMEXT_DEF) @$(call E, link: $@) - $(Q)$(call CFG_LINK_C, $@ $(LLVMEXT_OBJS) \ - $(CFG_LLVM_LIBS) $(CFG_LLVM_LDFLAGS)) + $(Q)$(call CFG_LINK_C,$@,$(CFG_LLVM_LDFLAGS) $(LLVMEXT_OBJS) \ + $(CFG_LLVM_LIBS),$(LLVMEXT_DEF)) ifdef CFG_BOOT_NATIVE boot/rustboot$(X): $(BOOT_CMXS) $(MKFILES) |