diff options
| author | Jason Evans <jasone@canonware.com> | 2016-10-27 17:10:56 -0700 |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-10-27 17:10:56 -0700 |
| commit | c44fa92db5cccf557d1ced431da6aa5ded58ed16 (patch) | |
| tree | e284ccb6c2bb03d52c6868fe736b3581e8f749ab /Makefile.in | |
| parent | 583c32c3056bff7606570e7836d33bf8fd18d299 (diff) | |
| download | platform_external_jemalloc_new-c44fa92db5cccf557d1ced431da6aa5ded58ed16.tar.gz platform_external_jemalloc_new-c44fa92db5cccf557d1ced431da6aa5ded58ed16.tar.bz2 platform_external_jemalloc_new-c44fa92db5cccf557d1ced431da6aa5ded58ed16.zip | |
Only use --whole-archive with gcc.
Conditionalize use of --whole-archive on the platform plus compiler,
rather than on the ABI. This fixes a regression caused by
7b24c6e5570062495243f1e55131b395adb31e33 (Use --whole-archive when
linking integration tests on MinGW.).
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index d509d551..eb77d9f2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,6 +51,7 @@ enable_code_coverage := @enable_code_coverage@ enable_prof := @enable_prof@ enable_zone_allocator := @enable_zone_allocator@ MALLOC_CONF := @JEMALLOC_CPREFIX@MALLOC_CONF +link_whole_archive := @link_whole_archive@ DSO_LDFLAGS = @DSO_LDFLAGS@ SOREV = @SOREV@ PIC_CFLAGS = @PIC_CFLAGS@ @@ -119,7 +120,7 @@ DSOS := $(objroot)lib/$(LIBJEMALLOC).$(SOREV) ifneq ($(SOREV),$(SO)) DSOS += $(objroot)lib/$(LIBJEMALLOC).$(SO) endif -ifeq (pecoff, $(ABI)) +ifeq (1, $(link_whole_archive)) LJEMALLOC := -Wl,--whole-archive -L$(objroot)lib -l$(LIBJEMALLOC) -Wl,--no-whole-archive else LJEMALLOC := $(objroot)lib/$(LIBJEMALLOC).$(IMPORTLIB) @@ -135,7 +136,7 @@ C_TESTLIB_SRCS := $(srcroot)test/src/btalloc.c $(srcroot)test/src/btalloc_0.c \ $(srcroot)test/src/mtx.c $(srcroot)test/src/mq.c \ $(srcroot)test/src/SFMT.c $(srcroot)test/src/test.c \ $(srcroot)test/src/thd.c $(srcroot)test/src/timer.c -ifeq (pecoff, $(ABI)) +ifeq (1, $(link_whole_archive)) C_UTIL_INTEGRATION_SRCS := else C_UTIL_INTEGRATION_SRCS := $(srcroot)src/nstime.c $(srcroot)src/util.c |