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

4 files changed, 8 insertions, 10 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
diff --git a/tools/gn/secondary/build/toolchain/mac/BUILD.gn b/tools/gn/secondary/build/toolchain/mac/BUILD.gn
index ee2a899..9a0fe44 100644
--- a/tools/gn/secondary/build/toolchain/mac/BUILD.gn
+++ b/tools/gn/secondary/build/toolchain/mac/BUILD.gn
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-cc = to_build_path("//third_party/llvm-build/Release+Asserts/bin/clang")
-cxx = to_build_path("//third_party/llvm-build/Release+Asserts/bin/clang++")
+cc = rebase_path("//third_party/llvm-build/Release+Asserts/bin/clang", ".", root_build_dir)
+cxx = rebase_path("//third_party/llvm-build/Release+Asserts/bin/clang++", ".", root_build_dir)
 ld = cxx
 
 toolchain("clang") {
diff --git a/tools/gn/secondary/crypto/BUILD.gn b/tools/gn/secondary/crypto/BUILD.gn
index 9db016c..248b699 100644
--- a/tools/gn/secondary/crypto/BUILD.gn
+++ b/tools/gn/secondary/crypto/BUILD.gn
@@ -235,6 +235,6 @@ test("crypto_unittests") {
   ]
 
   if (is_mac) {
-    deps += "//third_party/nss:nspr"
+    #deps += "//third_party/nss:nspr"
   }
 }
diff --git a/tools/gn/secondary/net/BUILD.gn b/tools/gn/secondary/net/BUILD.gn
index bba71fa..95ac4bd 100644
--- a/tools/gn/secondary/net/BUILD.gn
+++ b/tools/gn/secondary/net/BUILD.gn
@@ -847,8 +847,6 @@ component("net") {
     "socket/stream_socket.h",
     "socket/tcp_client_socket.cc",
     "socket/tcp_client_socket.h",
-    "socket/tcp_client_socket_libevent.cc",
-    "socket/tcp_client_socket_libevent.h",
     "socket/tcp_client_socket_win.cc",
     "socket/tcp_client_socket_win.h",
     "socket/tcp_listen_socket.cc",
@@ -1106,9 +1104,9 @@ component("net") {
       "ssl/client_cert_store_impl_nss.cc",
     ]
     deps += [
-      "//net/third_party/nss/ssl:crssl",
-      "//third_party/nss:nspr",
-      "//third_party/nss:nss",
+      #"//net/third_party/nss/ssl:crssl",
+      #"//third_party/nss:nspr",
+      #"//third_party/nss:nss",
     ]
   }