summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-05-31 09:38:43 +0200
committerBernard Normier <bernard@zeroc.com>2018-09-19 15:43:29 -0400
commita445420674711543a5ec38c95c84fe13748a4daf (patch)
tree362fca3153f47a2ba18763c54f42cfac379c1137
parentFix Xcode 10 warnings (diff)
downloadice-3.7.1-xcode10.tar.bz2
ice-3.7.1-xcode10.tar.xz
ice-3.7.1-xcode10.zip
Fixed bug where component libs/systemlib wouldn't be added to linker flags when building with the static configurationv3.7.1-xcode10
-rw-r--r--config/Make.project.rules2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/Make.project.rules b/config/Make.project.rules
index 12f6e4619e3..357eaa59650 100644
--- a/config/Make.project.rules
+++ b/config/Make.project.rules
@@ -1117,6 +1117,8 @@ config_dependency = $6
static_targetrule = $(if $(filter-out program,$($1_target)),static)
static_cppflags += $(strip $(call make-lib-cppflags,$4)) -DICE_STATIC_LIBS
static_ldflags += $$(call make-ldflags,$$(call get-all-deps,$4),make-static-dep-ldflags,$4,runique)\
+ $$(call make-ldflags,$4,make-lib-ldflags,$4,unique)\
+ $$(call make-ldflags,$4,make-system-lib-ldflags,$4,unique)\
$$(call make-ldflags,$$(call get-all-deps,$4),make-lib-ldflags,$4,unique)\
$$(call make-ldflags,$$(call get-all-deps,$4),make-system-lib-ldflags,$4,unique)