diff options
author | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
commit | c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c (patch) | |
tree | e9edd581ad60ab80aa5ab423a2a80df652a75792 /third_party/libxslt/libxslt.target.linux-x86_64.mk | |
parent | 54cd42278ccf1d52996034848086a09b23065a40 (diff) | |
download | chromium_org-c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c.tar.gz |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
Diffstat (limited to 'third_party/libxslt/libxslt.target.linux-x86_64.mk')
-rw-r--r-- | third_party/libxslt/libxslt.target.linux-x86_64.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/third_party/libxslt/libxslt.target.linux-x86_64.mk b/third_party/libxslt/libxslt.target.linux-x86_64.mk index c65c446e5b..5b62ab360d 100644 --- a/third_party/libxslt/libxslt.target.linux-x86_64.mk +++ b/third_party/libxslt/libxslt.target.linux-x86_64.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libxslt_libxslt_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TAGS := optional -gyp_intermediate_dir := $(call local-intermediates-dir) -gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) +LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) +gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := @@ -242,9 +243,9 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. LOCAL_LDFLAGS_Debug := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ @@ -259,9 +260,9 @@ LOCAL_LDFLAGS_Debug := \ LOCAL_LDFLAGS_Release := \ - -Wl,--fatal-warnings \ -Wl,-z,now \ -Wl,-z,relro \ + -Wl,--fatal-warnings \ -Wl,-z,noexecstack \ -fPIC \ -m64 \ |