Skip to content

Commit 01485f3

Browse files
committed
build: Add -Wl,-whole-archive to the link flags. Should put out the burning tinderbox on Linux.
1 parent e2d4fb0 commit 01485f3

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Makefile.in

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ ifeq ($(CFG_OSTYPE), Linux)
3838
CFG_LIB_NAME=lib$(1).so
3939
CFG_GCC_CFLAGS += -fPIC -march=i686
4040
CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
41-
CFG_GCC_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list=
41+
CFG_GCC_DEF_FLAG := -Wl,-whole-archive,--export-dynamic,--dynamic-list=
42+
CFG_GCC_POST_LIB_FLAGS := -Wl,-no-whole-archive
4243
ifeq ($(CFG_CPUTYPE), x86_64)
4344
CFG_GCC_CFLAGS += -m32
4445
CFG_GCC_LINK_FLAGS += -m32
@@ -347,6 +348,7 @@ RUNTIME_HDR := rt/globals.h \
347348
RUNTIME_DEF := rt/rustrt$(CFG_DEF_SUFFIX)
348349
RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash
349350
RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o)
351+
RUNTIME_LIBS := $(CFG_GCC_POST_LIB_FLAGS)
350352

351353
######################################################################
352354
# rustc LLVM-extensions (C++) library variables
@@ -361,7 +363,8 @@ RUSTLLVM_DEF := rustllvm/rustllvm$(CFG_DEF_SUFFIX)
361363
RUSTLLVM_INCS := -iquote $(CFG_LLVM_INCDIR) \
362364
-iquote $(S)src/rustllvm/include
363365
RUSTLLVM_OBJS := $(RUSTLLVM_CS:.cpp=.o)
364-
RUSTLLVM_LIBS := $(CFG_LLVM_LDFLAGS) $(CFG_LLVM_LIBS)
366+
RUSTLLVM_LIBS := $(CFG_LLVM_LDFLAGS) $(CFG_LLVM_LIBS) \
367+
$(CFG_GCC_POST_LIB_FLAGS)
365368

366369
######################################################################
367370
# Standard library variables
@@ -404,12 +407,12 @@ all: boot/rustboot$(X) \
404407

405408
rt/$(CFG_RUNTIME): $(RUNTIME_OBJS) $(MKFILES) $(RUNTIME_HDR) $(RUNTIME_DEF)
406409
@$(call E, link: $@)
407-
$(Q)$(call CFG_LINK_C,$@,$(RUNTIME_OBJS),$(RUNTIME_DEF))
410+
$(Q)$(call CFG_LINK_C,$@,$(RUNTIME_LIBS) $(RUNTIME_OBJS),$(RUNTIME_DEF))
408411

409412
rustllvm/$(CFG_RUSTLLVM): $(RUSTLLVM_OBJS) $(MKFILES) $(RUSTLLVM_HDR) \
410413
$(RUSTLLVM_DEF)
411414
@$(call E, link: $@)
412-
$(Q)$(call CFG_LINK_C,$@,$(CFG_LLVM_LDFLAGS) $(RUSTLLVM_OBJS) \
415+
$(Q)$(call CFG_LINK_C,$@,$(RUSTLLVM_LIBS) $(RUSTLLVM_OBJS) \
413416
$(CFG_LLVM_LIBS) $(CFG_LLVM_LDFLAGS),$(RUSTLLVM_DEF))
414417

415418
ifdef CFG_BOOT_NATIVE

0 commit comments

Comments
 (0)