diff options
| author | ruki <[email protected]> | 2022-09-16 23:02:34 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2022-09-16 23:02:34 +0800 |
| commit | b3218582b505503ea17c20de3639af5b5704d816 (patch) | |
| tree | de92f271a76bd3f2b00ddf25a941d5ff83451840 | |
| parent | e09492c11bdfb481a7c013e10e00f2acc8522a96 (diff) | |
update changelog
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | xmake/modules/private/action/trybuild/meson.lua | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e4f84c79..ddc387f1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ * [#2719](https://github.com/xmake-io/xmake/issues/2719): Add `package.librarydeps.strict_compatibility` to strict compatibility for package linkdeps * [#2810](https://github.com/xmake-io/xmake/pull/2810): Support os.execv to run shell script file * [#2817](https://github.com/xmake-io/xmake/pull/2817): Improve rule to support dependence order -* [#2824](https://github.com/xmake-io/xmake/pull/2824): Pass cross-file to meson.install +* [#2824](https://github.com/xmake-io/xmake/pull/2824): Pass cross-file to meson.install and trybuild ### Changes @@ -1398,7 +1398,7 @@ * [#2719](https://github.com/xmake-io/xmake/issues/2719): 添加 `package.librarydeps.strict_compatibility` 策略严格限制包依赖兼容性 * [#2810](https://github.com/xmake-io/xmake/pull/2810): 支持 os.execv 去执行 shell 脚本文件 * [#2817](https://github.com/xmake-io/xmake/pull/2817): 改进规则支持依赖顺序执行 -* [#2824](https://github.com/xmake-io/xmake/pull/2824): 传递 cross-file 交叉编译环境给 meson.install +* [#2824](https://github.com/xmake-io/xmake/pull/2824): 传递 cross-file 交叉编译环境给 meson.install 和 trybuild ### 改进 diff --git a/xmake/modules/private/action/trybuild/meson.lua b/xmake/modules/private/action/trybuild/meson.lua index 395084793..8c6882986 100644 --- a/xmake/modules/private/action/trybuild/meson.lua +++ b/xmake/modules/private/action/trybuild/meson.lua @@ -181,7 +181,6 @@ function _get_cross_file(buildir) return crossfile end - -- get configs function _get_configs(artifacts_dir, buildir) |