diff options
| -rw-r--r-- | xmake/languages/ascendc/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/core/tools/bisheng.lua | 3 | ||||
| -rw-r--r-- | xmake/toolchains/ascendc/load.lua | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/xmake/languages/ascendc/xmake.lua b/xmake/languages/ascendc/xmake.lua index 053be74df..69d5f8414 100644 --- a/xmake/languages/ascendc/xmake.lua +++ b/xmake/languages/ascendc/xmake.lua @@ -58,10 +58,8 @@ language("ascendc") , "target.strip" , "target.symbols" , "target.optimize:check" - , "target.ascnpuarchs" , "toolchain.linkdirs" , "toolchain.rpathdirs" - , "toolchain.ascnpuarchs" , "config.links" -- move it before target.links to keep package/dependency order correct , "target.linkgroups" @@ -79,10 +77,8 @@ language("ascendc") , "target.strip" , "target.symbols" , "target.optimize:check" - , "target.ascnpuarchs" , "toolchain.linkdirs" , "toolchain.rpathdirs" - , "toolchain.ascnpuarchs" , "config.links" , "target.links" , "target.linkgroups" diff --git a/xmake/modules/core/tools/bisheng.lua b/xmake/modules/core/tools/bisheng.lua index 9eef884b3..acfcab2f8 100644 --- a/xmake/modules/core/tools/bisheng.lua +++ b/xmake/modules/core/tools/bisheng.lua @@ -31,6 +31,9 @@ end -- make the npu-arch flag function nf_ascnpuarch(self, arch) + if self:kind() == "aicpu" then + return + end return "--npu-arch=" .. arch end diff --git a/xmake/toolchains/ascendc/load.lua b/xmake/toolchains/ascendc/load.lua index 696541c9d..451cc136d 100644 --- a/xmake/toolchains/ascendc/load.lua +++ b/xmake/toolchains/ascendc/load.lua @@ -42,9 +42,7 @@ function main(toolchain) toolchain:add("syslinks", "ascendcl", "acl_rt", "dl") -- aicpu-specific compiler flags (SDK-path-dependent) - toolchain:add("aicpuflags", "-fvisibility-inlines-hidden") - toolchain:add("aicpuflags", "-D_GLIBCXX_USE_CXX11_ABI=0") - toolchain:add("aicpuflags", "-D_GNU_SOURCE") + toolchain:add("aicpuflags", "-D_AICPU_DEVICE_") toolchain:add("aicpuflags", "--cce-aicpu-L" .. path.join(hostroot, "lib64", "device", "lib64")) toolchain:add("aicpuflags", "--cce-aicpu-laicpu_api") toolchain:add("aicpuflags", "--cce-aicpu-toolkit-path=" .. path.join(sdkdir, "toolkit", "toolchain", "hcc", "bin")) |