OSDN Git Service
(root)
/
android-x86
/
external-llvm-project.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be59bac
)
[gn build] fix libcxx gn file with libcxx_abi_namespace set
author
Nico Weber
<thakis@chromium.org>
Wed, 20 Jan 2021 00:02:40 +0000
(19:02 -0500)
committer
Nico Weber
<thakis@chromium.org>
Wed, 20 Jan 2021 00:02:40 +0000
(19:02 -0500)
llvm/utils/gn/secondary/libcxx/include/BUILD.gn
patch
|
blob
|
history
diff --git
a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
index
faaaf04
..
644f0a7
100644
(file)
--- 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" ]