Skip to content

Commit f284c5c

Browse files
committed
Generate the platform-specific .def files at build time
1 parent 99682db commit f284c5c

File tree

7 files changed

+20
-1976
lines changed

7 files changed

+20
-1976
lines changed

Makefile.in

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ RUNTIME_HDR := rt/globals.h \
344344
rt/test/rust_test_runtime.h \
345345
rt/test/rust_test_util.h
346346

347-
RUNTIME_DEF := $(S)src/rt/rustrt$(CFG_DEF_SUFFIX)
347+
RUNTIME_DEF := rt/rustrt$(CFG_DEF_SUFFIX)
348348
RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash
349349
RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o)
350350

@@ -356,7 +356,7 @@ RUSTLLVM_CS := $(addprefix rustllvm/, \
356356
MachOObjectFile.cpp Object.cpp RustWrapper.cpp)
357357

358358
RUSTLLVM_HDR := rustllvm/include/llvm-c/Object.h
359-
RUSTLLVM_DEF := $(S)src/rustllvm/rustllvm$(CFG_DEF_SUFFIX)
359+
RUSTLLVM_DEF := rustllvm/rustllvm$(CFG_DEF_SUFFIX)
360360

361361
RUSTLLVM_INCS := -iquote $(CFG_LLVM_INCDIR) \
362362
-iquote $(S)src/rustllvm/include
@@ -514,6 +514,24 @@ rustllvm/%.o: rustllvm/%.cpp $(MKFILES)
514514
$(Q)ocamllex$(OPT) -q -o $@ $<
515515

516516

517+
%.linux.def: %.def.in $(MKFILES)
518+
@$(call E, def: $@)
519+
$(Q)echo "{" > $@
520+
$(Q)sed 's/.$$/&;/' $< >> $@
521+
$(Q)echo "};" >> $@
522+
523+
%.darwin.def: %.def.in $(MKFILES)
524+
@$(call E, def: $@)
525+
$(Q)sed 's/^./_&/' $< > $@
526+
527+
ifdef CFG_WINDOWSY
528+
%.def: %.def.in $(MKFILES)
529+
@$(call E, def: $@)
530+
$(Q)echo LIBRARY $* > $@
531+
$(Q)echo EXPORTS >> $@
532+
$(Q)sed 's/^./ &/' $< >> $@
533+
endif
534+
517535
######################################################################
518536
# Doc rules
519537
######################################################################

src/rt/rustrt.darwin.def

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/rt/rustrt.def

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/rt/rustrt.linux.def

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)