summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-07-21 11:05:53 +0800
committerruki <[email protected]>2017-07-21 11:05:53 +0800
commit16af707201c013f9b1be26bba7aceed349019631 (patch)
tree278369151f8ff9f4b65ad0c3e96cfa76a8f9f4d2
parent5bac5ca75bfcbf449007ce5f8a94bdce1b81b0bb (diff)
fix compile shared lib using clang on linux
-rw-r--r--tests/projects/shared_library_c/src/interface.cpp6
-rw-r--r--tests/projects/shared_library_c/src/test.cpp10
-rw-r--r--tests/projects/shared_library_c/xmake.lua4
-rw-r--r--xmake/modules/core/tools/clang.lua3
4 files changed, 2 insertions, 21 deletions
diff --git a/tests/projects/shared_library_c/src/interface.cpp b/tests/projects/shared_library_c/src/interface.cpp
deleted file mode 100644
index 598d07560..000000000
--- a/tests/projects/shared_library_c/src/interface.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "interface.h"
-
-int add(int a, int b)
-{
- return a + b;
-}
diff --git a/tests/projects/shared_library_c/src/test.cpp b/tests/projects/shared_library_c/src/test.cpp
deleted file mode 100644
index 72e03272b..000000000
--- a/tests/projects/shared_library_c/src/test.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "interface.h"
-#include <iostream>
-
-using namespace std;
-
-int main(int argc, char** argv)
-{
- cout << "add(1, 2) = " << add(1, 2) << endl;
- return 0;
-}
diff --git a/tests/projects/shared_library_c/xmake.lua b/tests/projects/shared_library_c/xmake.lua
index 4cad3064f..50bad8879 100644
--- a/tests/projects/shared_library_c/xmake.lua
+++ b/tests/projects/shared_library_c/xmake.lua
@@ -28,7 +28,7 @@ target("shared_library_c")
set_kind("shared")
-- add files
- add_files("src/interface.cpp")
+ add_files("src/interface.c")
-- add target
target("test")
@@ -40,6 +40,6 @@ target("test")
add_deps("shared_library_c")
-- add files
- add_files("src/test.cpp")
+ add_files("src/test.c")
diff --git a/xmake/modules/core/tools/clang.lua b/xmake/modules/core/tools/clang.lua
index 7da8dd858..46f1a16c6 100644
--- a/xmake/modules/core/tools/clang.lua
+++ b/xmake/modules/core/tools/clang.lua
@@ -31,9 +31,6 @@ function init(self)
-- init super
_super.init(self)
- -- init shflags
- _super._g.shflags = { "-dynamiclib", "-fPIC" }
-
-- suppress warning
_super._g.cxflags = {"-Qunused-arguments"}
_super._g.mxflags = {"-Qunused-arguments"}