diff options
| author | ruki <[email protected]> | 2024-06-06 07:37:27 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-06-06 07:37:27 +0800 |
| commit | c1a1cd33022614e10e08dd3a52a9cf3e24bd5e32 (patch) | |
| tree | d9874f22c679bd2ebbe97835b09174e0318e279c | |
| parent | 5c2b2d655df07ded0361d200c65961694af0a663 (diff) | |
| parent | db24e0460ba6da51033f546426e0512f0c1c988d (diff) | |
Merge pull request #5195 from xmake-io/pack
Improve pack to fix config
| -rw-r--r-- | tests/projects/c++/modules/test_base.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/pack/main.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index 219901c63..80206983a 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -36,7 +36,7 @@ end function main(t) if is_subhost("windows") then local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then os.exec("xmake f --toolchain=clang -c --yes") _build() os.exec("xmake clean -a") diff --git a/xmake/plugins/pack/main.lua b/xmake/plugins/pack/main.lua index d55855143..960bebe03 100644 --- a/xmake/plugins/pack/main.lua +++ b/xmake/plugins/pack/main.lua @@ -116,7 +116,7 @@ function main() project.lock() -- load config first - config.load() + task.run("config", {}, {disable_dump = true}) -- enter project directory local oldir = os.cd(project.directory()) |