summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-11-02 22:33:28 +0800
committerruki <[email protected]>2020-11-02 22:33:28 +0800
commit4b6ecc8c7f6ee75aa91a185cf8c49930cce825c3 (patch)
treeb55c5ae2560f688720d3c2ef6466fbbde02e0c3b
parente918256c7d57e54590f1672cf8021210ea115cd0 (diff)
improve tools/autoconf
-rw-r--r--xmake/modules/package/tools/autoconf.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index 2f15cbf89..55ef0041e 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -118,7 +118,6 @@ function buildenvs(package)
local cflags = table.join(table.wrap(package:build_getenv("cxflags")), package:build_getenv("cflags"))
local cxxflags = table.join(table.wrap(package:build_getenv("cxflags")), package:build_getenv("cxxflags"))
envs.CC = package:build_getenv("cc")
- envs.CXX = package:build_getenv("cxx")
envs.AS = package:build_getenv("as")
envs.AR = package:build_getenv("ar")
envs.LD = package:build_getenv("ld")
@@ -152,6 +151,9 @@ function buildenvs(package)
envs.CPP = _translate_windows_bin_path(envs.CPP)
envs.RANLIB = _translate_windows_bin_path(envs.RANLIB)
end
+ elseif package:is_plat("cross") then
+ -- only for cross-toolchain
+ envs.CXX = package:build_getenv("cxx")
end
end
local ACLOCAL_PATH = {}