summaryrefslogtreecommitdiffstats
path: root/core/combo/HOST_darwin-x86.mk
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-03-11 14:59:42 +0000
committerTorne (Richard Coles) <torne@google.com>2013-03-11 14:59:42 +0000
commit71f8b245ce553452c1a0691aaf225e6fad5aecd6 (patch)
tree805c6872df05273adc7e85e28ed91d1bd54872b3 /core/combo/HOST_darwin-x86.mk
parenteb73384e02639259b3ef04bb1856607d4dcf265c (diff)
downloadbuild-71f8b245ce553452c1a0691aaf225e6fad5aecd6.zip
build-71f8b245ce553452c1a0691aaf225e6fad5aecd6.tar.gz
build-71f8b245ce553452c1a0691aaf225e6fad5aecd6.tar.bz2
Don't try to group static libraries on mac.
Mac's linker doesn't support --start-group and --end-group; it scans libraries repeatedly even without these options, so it's not necessary. Change-Id: If22527e75470f7fa9452dc33efe4d40a60d0919a
Diffstat (limited to 'core/combo/HOST_darwin-x86.mk')
-rw-r--r--core/combo/HOST_darwin-x86.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index 7361ce9..ba61cbf 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -123,9 +123,7 @@ $(hide) $(PRIVATE_CXX) \
$(PRIVATE_ALL_OBJECTS) \
$(addprefix -force_load , $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
$(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
- $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
$(call normalize-host-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
- $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
$(PRIVATE_LDLIBS) \
-o $@ \
-install_name @rpath/$(notdir $@) \
@@ -144,9 +142,7 @@ $(hide) $(PRIVATE_CXX) \
$(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
$(PRIVATE_ALL_OBJECTS) \
$(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
- $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
$(call normalize-host-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
- $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
$(PRIVATE_LDFLAGS) \
$(PRIVATE_LDLIBS) \
$(HOST_LIBGCC)