[llvm-branch-commits] [llvm] 7f36df0 - [gn build] fix libcxx gn file with libcxx_abi_namespace set

[Nico Weber via llvm-branch-commits]

Author: Nico Weber
Date: 2021-01-19T19:02:40-05:00
New Revision: 7f36df0fb19c08879822cf5b7d4bba300fc8c058

URL: https://github.com/llvm/llvm-project/commit/7f36df0fb19c08879822cf5b7d4bba300fc8c058
DIFF: https://github.com/llvm/llvm-project/commit/7f36df0fb19c08879822cf5b7d4bba300fc8c058.diff

LOG: [gn build] fix libcxx gn file with libcxx_abi_namespace set

Added: 
    

Modified: 
    llvm/utils/gn/secondary/libcxx/include/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
index faaaf049b063..644f0a767558 100644
--- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -25,7 +25,6 @@ write_cmake_config("write_config") {
     "_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS=1",
     "_LIBCPP_NO_VCRUNTIME=",
     "_LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION=",
-    "_LIBCPP_ABI_NAMESPACE=",
     "_LIBCPP_HAS_PARALLEL_ALGORITHMS=",
     "_LIBCPP_HAS_NO_RANDOM_DEVICE=",
     "_LIBCPP_HAS_NO_LOCALIZATION=",
@@ -38,6 +37,8 @@ write_cmake_config("write_config") {
   }
   if (libcxx_abi_namespace != "") {
     values += [ "_LIBCPP_ABI_NAMESPACE=$libcxx_abi_namespace" ]
+  } else {
+    values += [ "_LIBCPP_ABI_NAMESPACE=" ]
   }
   if (libcxx_abi_unstable) {
     values += [ "_LIBCPP_ABI_UNSTABLE=1" ]