[llvm] eca6352 - [gn build] Set _LIBCPP_ABI_NAMESPACE to __$libcxx_abi_version

Arthur Eubanks via llvm-commits llvm-commits at lists.llvm.org
Wed Oct 12 11:59:46 PDT 2022


Author: Arthur Eubanks
Date: 2022-10-12T11:59:12-07:00
New Revision: eca6352a9c9096f97c7fe8f988efc45296c3d19e

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

LOG: [gn build] Set _LIBCPP_ABI_NAMESPACE to __$libcxx_abi_version

Matches CMake build.
Otherwise currently everything is literally std::_LIBCPP_ABI_NAMESPACE::foo.

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 1118d7962e820..01c7565600ae5 100644
--- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -47,7 +47,7 @@ if (current_toolchain == default_toolchain) {
     if (libcxx_abi_namespace != "") {
       values += [ "_LIBCPP_ABI_NAMESPACE=$libcxx_abi_namespace" ]
     } else {
-      values += [ "_LIBCPP_ABI_NAMESPACE=" ]
+      values += [ "_LIBCPP_ABI_NAMESPACE=__" + libcxx_abi_version ]
     }
   }
 


        


More information about the llvm-commits mailing list