commit 8096f094577366003655c5b86ca31d85cd57aa4b
author Roland McGrath <mcgrathr@google.com> Sat Mar 23 07:17:42 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Sat Mar 23 07:17:42 2019 +0000
tree aca14917113a388f4531be5bb0c2bd1aad29e9da
parent a421d96c0931e5f77cf3ad9e1c81bcf55e4c4096

[zircon][gn] Fix static-libc++ config for Fuchsia case

The change to fix it for macOS broke it for Fuchsia.

Change-Id: I37673fd63ec3c543a441003ce8cb55b0320c3f84

zircon/public/gn/config/BUILD.gn

diff --git a/zircon/public/gn/config/BUILD.gn b/zircon/public/gn/config/BUILD.gn
index 91f98b3..905b751 100644
--- a/zircon/public/gn/config/BUILD.gn
+++ b/zircon/public/gn/config/BUILD.gn
@@ -527,19 +527,26 @@
 }
 
 config("static-libc++") {
-  if (current_os == "linux") {
-    ldflags = [ "-static-libstdc++" ]
-    # TODO(TC-74): The implicitly linked static libc++.a depends on these.
-    libs = [
-      "dl",
-      "pthread",
-    ]
-  } else if (current_os == "mac") {
+  if (current_os == "mac") {
+    # The macOS driver doesn't support -static-libstdc++ properly, so pass
+    # the libraries directly.  This has to locate the files explicitly in
+    # the toolchain, because -lc++ would look for the shared library.
     ldflags = [ "-nostdlib++" ]
+    libcxx_dir = "${toolchain.tool_dir}/../lib"
     libs = [
-      "${toolchain.tool_dir}/../lib/libc++abi.a",
-      "${toolchain.tool_dir}/../lib/libc++.a",
+      "$libcxx_dir/libc++abi.a",
+      "$libcxx_dir/libc++.a",
     ]
+  } else {
+    ldflags = [ "-static-libstdc++" ]
+
+    # TODO(TC-74): The implicitly linked static libc++.a depends on these.
+    if (current_os == "linux") {
+      libs = [
+        "dl",
+        "pthread",
+      ]
+    }
   }
 }