summaryrefslogtreecommitdiffstats
path: root/tools/gn/secondary/build/config/compiler/BUILD.gn
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-02 22:50:23 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-02 22:50:23 +0000
commitc594409cef9782b595757a9f5751d4be2ea5369d (patch)
tree1b99aff8ceda7f545aa503fdc49e3ee652198b69 /tools/gn/secondary/build/config/compiler/BUILD.gn
parent7843c22e3d21be31b012c68cc8f0bea27b4dcc16 (diff)
downloadchromium_src-c594409cef9782b595757a9f5751d4be2ea5369d.zip
chromium_src-c594409cef9782b595757a9f5751d4be2ea5369d.tar.gz
chromium_src-c594409cef9782b595757a9f5751d4be2ea5369d.tar.bz2
Get gn generation working on mac
This fixes a few minor issues so initial gn generation passes and the 'base' target can be built. Specifically: - fixes so ldflags in the compiler config - update to_build_path() calls to rebase_path() calls - comment out some deps on nss targets that don't exist yet R=brettw Review URL: https://codereview.chromium.org/25583005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/secondary/build/config/compiler/BUILD.gn')
-rw-r--r--tools/gn/secondary/build/config/compiler/BUILD.gn4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gn/secondary/build/config/compiler/BUILD.gn b/tools/gn/secondary/build/config/compiler/BUILD.gn
index cd4e49b..bf12a04 100644
--- a/tools/gn/secondary/build/config/compiler/BUILD.gn
+++ b/tools/gn/secondary/build/config/compiler/BUILD.gn
@@ -26,8 +26,6 @@ config("compiler") {
"-fvisibility-inlines-hidden",
]
ldflags = [
- "-Wl,-z,now",
- "-Wl,-z,relro",
]
# Optimization.
@@ -98,6 +96,8 @@ config("compiler") {
"-fPIC",
"-pthread",
"-Wl,-z,noexecstack",
+ "-Wl,-z,now",
+ "-Wl,-z,relro",
# TODO(brettw) gold linker flags, only target.
# There seems to be a conflict of --icf and -pie in gold which can