ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-07 11:30:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix regression for non Mac OS X platforms linking in archives

Browse Source
This commit is contained in:
Eric Scharff 2007-10-25 08:58:44 -06:00
parent 782f7e8feb
commit 5131cac38a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -59,6 +59,8 @@ common-cflags = $(warnings) -fno-rtti -fno-exceptions \
system = posix
asm = x86
begin-merge-archive = -Wl,--whole-archive
end-merge-archive = -Wl,--no-whole-archive
ifeq ($(platform),darwin)
rdynamic =
@ -66,6 +68,8 @@ ifeq ($(platform),darwin)
shared = -dynamiclib
pthread =
lpthread =
begin-merge-archive = -Wl,-all_load
end-merge-archive =
endif
ifeq ($(platform),windows)
inc = /usr/local/win32/include
@ -280,7 +284,7 @@ endif
$(executable): $(archive)
@echo "linking $(@)"
$(cc) -Wl,-all_load $(^) \
$(cc) $(begin-merge-archive) -Wl,-all_load $(^) $(end-merge-archive) \
$(lflags) $(rdynamic) -o $(@)
@$(strip) --strip-all $(@)
@$(show-size) $(@)