From 0fdefd2f7280db640ed09df068e09f98649ce7ec Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 5 Nov 2022 00:39:52 +0800 Subject: fix clang c++ --- tests/projects/c++/modules/stdmodules/test/test.cpp | 6 +++--- xmake/rules/c++/modules/modules_support/clang.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/projects/c++/modules/stdmodules/test/test.cpp b/tests/projects/c++/modules/stdmodules/test/test.cpp index 380f02838..a12813c24 100644 --- a/tests/projects/c++/modules/stdmodules/test/test.cpp +++ b/tests/projects/c++/modules/stdmodules/test/test.cpp @@ -1,5 +1,3 @@ -#include - #ifdef _MSC_VER import std.core; #else @@ -8,6 +6,8 @@ import std; import my_module; +using namespace std; + int main(int argc, char** argv) { - printf("sum: %d\n", my_sum(1, 1)); + cout << my_sum(1, 1) << endl; } diff --git a/xmake/rules/c++/modules/modules_support/clang.lua b/xmake/rules/c++/modules/modules_support/clang.lua index 0727cb6d5..a3cf06e79 100644 --- a/xmake/rules/c++/modules/modules_support/clang.lua +++ b/xmake/rules/c++/modules/modules_support/clang.lua @@ -97,7 +97,7 @@ function load(target) -- on ubuntu: -- sudo apt install libc++-dev libc++abi-15-dev -- - target:data_set("cxx.modules.use_libc++", table.contains(target:get("cxxflags"), "-stdlib=libc++")) + target:data_set("cxx.modules.use_libc++", table.contains(target:get("cxxflags"), "-stdlib=libc++", "clang::-stdlib=libc++")) if target:data("cxx.modules.use_libc++") then target:add("syslinks", "c++") end -- cgit v1.3.1