summaryrefslogtreecommitdiff
path: root/xmake/toolchains/tinyc
diff options
context:
space:
mode:
authorruki <[email protected]>2021-02-16 23:43:57 +0800
committerruki <[email protected]>2021-02-16 23:43:57 +0800
commit5ec37d1979611aad83348afc8fc8c3adabbbc5b7 (patch)
tree29de062fe30b7888ac9d69c375854f579d45515b /xmake/toolchains/tinyc
parent7209d292659792a6d92071959537c09a2bd48c4c (diff)
improve cross/bindir/sdkdir for toolchains
Diffstat (limited to 'xmake/toolchains/tinyc')
-rw-r--r--xmake/toolchains/tinyc/xmake.lua9
1 files changed, 5 insertions, 4 deletions
diff --git a/xmake/toolchains/tinyc/xmake.lua b/xmake/toolchains/tinyc/xmake.lua
index 20d7eedf1..e64e68167 100644
--- a/xmake/toolchains/tinyc/xmake.lua
+++ b/xmake/toolchains/tinyc/xmake.lua
@@ -42,15 +42,16 @@ toolchain("tinyc")
import("lib.detect.find_tool")
-- find tcc
- local sdkdir = config.get("sdk")
+ local sdkdir = toolchain:sdkdir()
if not sdkdir and is_host("windows") then
local winenv_tccsdk = path.join(os.programdir(), "winenv", "tcc")
if os.isdir(winenv_tccsdk) then
sdkdir = winenv_tccsdk
end
end
- if find_tool("tcc", {paths = config.get("bin") or sdkdir}) then
- config.set("__tcc_sdkdir", sdkdir)
+ if find_tool("tcc", {paths = toolchain:bindir() or sdkdir}) then
+ toolchain:config_set("sdkdir", sdkdir)
+ toolchain:configs_save()
return true
end
end)
@@ -77,7 +78,7 @@ toolchain("tinyc")
end
-- init linkdirs and sysincludedirs
- local sdkdir = config.get("__tcc_sdkdir") or toolchain:sdkdir()
+ local sdkdir = toolchain:sdkdir()
if sdkdir then
local includedir = path.join(sdkdir, "include")
if os.isdir(includedir) then