summaryrefslogtreecommitdiff
path: root/xmake/rules/c++/modules/modules_support
diff options
context:
space:
mode:
authorruki <[email protected]>2024-11-27 00:44:00 +0800
committerruki <[email protected]>2024-11-27 00:44:00 +0800
commit6f558c50a9b5fd82fe4e45290a257b77c06a158a (patch)
tree258dca4b4156752afe25c51098ed5de773ede958 /xmake/rules/c++/modules/modules_support
parent3276686e4d2356dab029d94ada8f780e0702889a (diff)
fix gcc modules
Diffstat (limited to 'xmake/rules/c++/modules/modules_support')
-rw-r--r--xmake/rules/c++/modules/modules_support/gcc/compiler_support.lua7
1 files changed, 3 insertions, 4 deletions
diff --git a/xmake/rules/c++/modules/modules_support/gcc/compiler_support.lua b/xmake/rules/c++/modules/modules_support/gcc/compiler_support.lua
index f23beb20a..72de29081 100644
--- a/xmake/rules/c++/modules/modules_support/gcc/compiler_support.lua
+++ b/xmake/rules/c++/modules/modules_support/gcc/compiler_support.lua
@@ -60,8 +60,7 @@ function load(target)
-- @see https://github.com/xmake-io/xmake/issues/2716#issuecomment-1225057760
-- https://github.com/xmake-io/xmake/issues/3855
- -- libstdc++ std modules cannot compile with -D_GLIBCXX_USE_CXX11_ABI=0
- if target:policy("build.c++.modules.std") or target:policy("build.c++.gcc.modules.cxx11abi") then
+ if target:policy("build.c++.gcc.modules.cxx11abi") then
target:add("cxxflags", "-D_GLIBCXX_USE_CXX11_ABI=1")
else
target:add("cxxflags", "-D_GLIBCXX_USE_CXX11_ABI=0")
@@ -158,12 +157,12 @@ end
function get_stdmodules(target)
if not target:policy("build.c++.modules.std") then
- return nil
+ return
end
local modules_json_path = _get_std_module_manifest_path(target)
if not modules_json_path then
- return nil
+ return
end
local modules_json = json.loadfile(modules_json_path)