Commit bfbed0a
build: fix conflict gyp configs
Gyp generated build files can be built in either Release/Debug mode.
- make: single directory, two configurations by cli:
`make -C out BUILDTYPE=Release` and `make -C out BUILDTYPE=Debug`.
- msbuild: single directory, two configurations by cli:
`msbuild node.sln /p:Configuration=Release` and
`msbuild node.sln /p:Configuration=Debug`.
- ninja: two directories in `out/`, build with
`ninja -C out/Release` or `ninja -C out/Debug`.
Variables that changes with either Release or Debug configuration
should be defined in a configuration level, instead of the root level.
This fixes generating invalid build files.
Additionally, `v8_gypfiles/toolchain.gypi` duplicates defines in
`v8_gypfiles/features.gypi`. Remove the duplications in
`toolchains.gypi`
PR-URL: #53605
Fixes: #53446
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent c4848c5 commit bfbed0a
3 files changed
+15
-12
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1306 | 1306 | | |
1307 | 1307 | | |
1308 | 1308 | | |
| 1309 | + | |
| 1310 | + | |
| 1311 | + | |
1309 | 1312 | | |
1310 | 1313 | | |
1311 | 1314 | | |
| |||
1620 | 1623 | | |
1621 | 1624 | | |
1622 | 1625 | | |
1623 | | - | |
| 1626 | + | |
| 1627 | + | |
| 1628 | + | |
1624 | 1629 | | |
1625 | 1630 | | |
1626 | 1631 | | |
| |||
1638 | 1643 | | |
1639 | 1644 | | |
1640 | 1645 | | |
1641 | | - | |
1642 | 1646 | | |
1643 | 1647 | | |
1644 | 1648 | | |
| |||
2154 | 2158 | | |
2155 | 2159 | | |
2156 | 2160 | | |
| 2161 | + | |
| 2162 | + | |
| 2163 | + | |
| 2164 | + | |
2157 | 2165 | | |
2158 | 2166 | | |
2159 | 2167 | | |
| |||
2181 | 2189 | | |
2182 | 2190 | | |
2183 | 2191 | | |
2184 | | - | |
| 2192 | + | |
2185 | 2193 | | |
2186 | 2194 | | |
2187 | 2195 | | |
| |||
2204 | 2212 | | |
2205 | 2213 | | |
2206 | 2214 | | |
2207 | | - | |
2208 | 2215 | | |
2209 | 2216 | | |
2210 | 2217 | | |
| |||
2213 | 2220 | | |
2214 | 2221 | | |
2215 | 2222 | | |
| 2223 | + | |
| 2224 | + | |
| 2225 | + | |
2216 | 2226 | | |
2217 | 2227 | | |
2218 | 2228 | | |
| |||
2223 | 2233 | | |
2224 | 2234 | | |
2225 | 2235 | | |
2226 | | - | |
| 2236 | + | |
2227 | 2237 | | |
2228 | 2238 | | |
2229 | 2239 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
92 | 91 | | |
93 | 92 | | |
94 | 93 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
711 | 711 | | |
712 | 712 | | |
713 | 713 | | |
714 | | - | |
715 | | - | |
716 | | - | |
717 | 714 | | |
718 | | - | |
719 | | - | |
720 | | - | |
721 | 715 | | |
722 | 716 | | |
723 | 717 | | |
| |||
0 commit comments