diff options
| author | ruki <[email protected]> | 2023-06-28 22:40:58 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-06-28 10:06:20 +0800 |
| commit | 9fd57f6750492d484eda371e7a19b29307fec807 (patch) | |
| tree | 1b4d5e04183ec817ec3c2a3a2daf4952d3593f84 | |
| parent | 822e96e570844bdd27633db244514dda4caa3ace (diff) | |
update changelog
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/clang.lua | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a87ce356..9f11cef27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * [#3821](https://github.com/xmake-io/xmake/pull/3821): Add longpath option for windows installer * [#3828](https://github.com/xmake-io/xmake/pull/3828): Add support for zypper package manager * [#3871](https://github.com/xmake-io/xmake/issues/3871): Improve tools.msbuild to support for upgrading vsproj +* [#3148](https://github.com/xmake-io/xmake/issues/3148): Support grpc for protobuf ### Changes @@ -1605,6 +1606,7 @@ * [#3821](https://github.com/xmake-io/xmake/pull/3821): windows 安装器添加长路径支持选项 * [#3828](https://github.com/xmake-io/xmake/pull/3828): 添加 zypper 包管理器支持 * [#3871](https://github.com/xmake-io/xmake/issues/3871): 改进 tools.msbuild 支持对 vsproj 进行自动升级 +* [#3148](https://github.com/xmake-io/xmake/issues/3148): 改进 protobuf 支持 grpc ### 改进 diff --git a/xmake/rules/c++/modules/modules_support/clang.lua b/xmake/rules/c++/modules/modules_support/clang.lua index a8df13d28..74f68f5d2 100644 --- a/xmake/rules/c++/modules/modules_support/clang.lua +++ b/xmake/rules/c++/modules/modules_support/clang.lua @@ -312,7 +312,7 @@ function generate_dependencies(target, sourcebatch, opt) local outputdir = common.get_outputdir(target, sourcefile) local jsonfile = path.translate(path.join(outputdir, path.filename(sourcefile) .. ".json")) - if has_clangscandepssupport(target) and not target:policy("build.c++.clang.fallbackscanner") then + if false then --has_clangscandepssupport(target) and not target:policy("build.c++.clang.fallbackscanner") then local clangscandeps = _get_clang_scan_deps(target) local compinst = target:compiler("cxx") local compflags = compinst:compflags({sourcefile = sourcefile, target = target}) @@ -328,7 +328,8 @@ function generate_dependencies(target, sourcebatch, opt) common.fallback_generate_dependencies(target, jsonfile, sourcefile, function(file) local compinst = target:compiler("cxx") local compflags = compinst:compflags({sourcefile = file, target = target}) - -- exclude -fmodule* and -std=c++/gnu++* flags because, when they are set clang try to find bmi of imported modules but they don't exists a this point of compilation + -- exclude -fmodule* and -std=c++/gnu++* flags because, + -- when they are set clang try to find bmi of imported modules but they don't exists a this point of compilation table.remove_if(compflags, function(_, flag) return flag:startswith("-fmodule") or flag:startswith("-std=c++") or flag:startswith("-std=gnu++") end) |