diff options
| author | Ying Wang <wangying@android.com> | 2014-04-23 00:12:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-23 00:12:07 +0000 |
| commit | 871bc703e57d5b7629c043a54f5ac2614a17981b (patch) | |
| tree | 181781b65d496f88a5bee121262ae4ffc2597b86 /core/combo/HOST_darwin-x86.mk | |
| parent | 850299f6a6a831d47af68a3004a62df21b5fee3a (diff) | |
| parent | d318ba66f90272b618e035e996e0a04f02b4481d (diff) | |
| download | build-871bc703e57d5b7629c043a54f5ac2614a17981b.zip build-871bc703e57d5b7629c043a54f5ac2614a17981b.tar.gz build-871bc703e57d5b7629c043a54f5ac2614a17981b.tar.bz2 | |
Merge "Update build system for better Clang behavior on Mac."
Diffstat (limited to 'core/combo/HOST_darwin-x86.mk')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 994196a..b819f36 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -123,7 +123,9 @@ define transform-host-o-to-shared-lib-inner $(hide) $(PRIVATE_CXX) \ -dynamiclib -single_module -read_only_relocs suppress \ $(HOST_GLOBAL_LD_DIRS) \ - $(HOST_GLOBAL_LDFLAGS) \ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(PRIVATE_HOST_GLOBAL_LDFLAGS) \ + ) \ $(PRIVATE_ALL_OBJECTS) \ $(addprefix -force_load , $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ $(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ @@ -140,9 +142,11 @@ define transform-host-o-to-executable-inner $(hide) $(PRIVATE_CXX) \ -Wl,-rpath,@loader_path/../lib \ -o $@ \ - $(PRE_LION_DYNAMIC_LINKER_OPTIONS) -headerpad_max_install_names \ + $(PRE_LION_DYNAMIC_LINKER_OPTIONS) -Wl,-headerpad_max_install_names \ $(HOST_GLOBAL_LD_DIRS) \ - $(HOST_GLOBAL_LDFLAGS) \ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(PRIVATE_HOST_GLOBAL_LDFLAGS) \ + ) \ $(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ $(PRIVATE_ALL_OBJECTS) \ $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ |