summaryrefslogtreecommitdiff
path: root/xmake/actions/build/main.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2020-02-19 23:06:29 +0800
committerruki <[email protected]>2020-02-19 12:38:56 +0800
commited49fcb8e77087a12b01cae2bb7841a75a25b0fc (patch)
tree25877850c5751989bf46251afc57c3495f7ea223 /xmake/actions/build/main.lua
parente630b2edcccc8fd988f630959ac0cda5933251da (diff)
support cross-compilation for autotools
Diffstat (limited to 'xmake/actions/build/main.lua')
-rw-r--r--xmake/actions/build/main.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/xmake/actions/build/main.lua b/xmake/actions/build/main.lua
index 2918bb95f..a38ebb7c1 100644
--- a/xmake/actions/build/main.lua
+++ b/xmake/actions/build/main.lua
@@ -24,6 +24,7 @@ import("core.base.task")
import("core.project.config")
import("core.project.project")
import("core.platform.platform")
+import("core.platform.environment")
import("build")
import("build_files")
import("cleaner")
@@ -54,7 +55,7 @@ function _try_build()
raise("unknown build tool: %s", trybuild)
end
else
- for _, name in ipairs({"msbuild", "xcodebuild", "cmake", "autotools", "make"}) do
+ for _, name in ipairs({"msbuild", "xcodebuild", "cmake", "autotools", "meson", "make"}) do
tool = import("private.action.trybuild." .. name, {anonymous = true})
configfile = tool.detect()
if configfile then
@@ -69,7 +70,9 @@ function _try_build()
if not trybuild then
task.run("config", {target = targetname, trybuild = trybuild_detected})
end
+ environment.enter("toolchains")
tool.build()
+ environment.leave("toolchains")
end
end