File tree Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Expand file tree Collapse file tree 3 files changed +7
-19
lines changed Original file line number Diff line number Diff line change 5
5
buildconfig = " //llvm/utils/gn/build/BUILDCONFIG.gn"
6
6
7
7
# Disallow all calls to exec_script. We should be very conservative about
8
- # whitelisting things here.
9
- exec_script_whitelist = []
8
+ # allowing things here.
9
+ exec_script_allowlist = []
10
10
11
11
# Execute action() targets using Python 3.
12
12
script_executable = " python3"
Original file line number Diff line number Diff line change @@ -71,23 +71,6 @@ template("unix_toolchain") {
71
71
default_output_dir = " {{root_out_dir}}/lib"
72
72
}
73
73
74
- if (current_os == " ios" || current_os == " mac" ) {
75
- # gn < 1693 (e214b5d35898) doesn't support |frameworks|, requiring
76
- # frameworks to be listed in |libs|, but gn >= 1808 (3028c6a426a4) forbids
77
- # frameworks from appearing in |libs|. This assertion provides a helpful
78
- # cue to upgrade, and is much more user-friendly than the failure that
79
- # occurs when an older gn encounters |frameworks|.
80
- #
81
- # gn_version doesn’t actually exist in gn < 1709 (52cb644a3fb4), and
82
- # defined(gn_version) doesn't actually work as expected
83
- # (https://crbug.com/gn/183), so 1709 is the true minimum enforced by
84
- # this construct, and if gn_version is not available, this line will still
85
- # be blamed, making the resolution somewhat discoverable.
86
- assert (gn_version >= 1693 ,
87
- " Your GN is too old! " +
88
- " Update it, perhaps by running llvm/utils/gn/get.py" )
89
- }
90
-
91
74
# Make these apply to all tools below.
92
75
lib_switch = " -l"
93
76
lib_dir_switch = " -L"
Original file line number Diff line number Diff line change 1
1
import (" //clang/lib/StaticAnalyzer/Frontend/enable.gni" )
2
2
import (" //llvm/utils/gn/build/toolchain/compiler.gni" )
3
3
4
+ # `exec_script_allowlist` was added in GN version 2207, so that's the minimum
5
+ # version of GN we require.
6
+ assert (gn_version >= 2207 ,
7
+ " Your GN is too old! Update it, perhaps by running llvm/utils/gn/get.py" )
8
+
4
9
group (" default" ) {
5
10
deps = [
6
11
" //clang-tools-extra/clangd/test" ,
You can’t perform that action at this time.
0 commit comments