Skip to content

Commit f476e6b

Browse files
committed
fix: sync installSpecModules with upstream
1 parent 1e96560 commit f476e6b

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

electron/spec-runner.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,13 @@ export async function setupSpecRunner(electronRoot: string) {
7777
}
7878

7979
async function installSpecModules(dir: string) {
80-
// v8 headers use c++17 so override the gyp default of -std=c++14,
81-
// but don't clobber any other CXXFLAGS that were passed into spec-runner.js
82-
const CXXFLAGS = ["-std=c++17", process.env.CXXFLAGS]
83-
.filter((x) => !!x)
84-
.join(" ");
85-
8680
const nodeDir = path.resolve(
8781
BASE,
8882
`out/${utils.getOutDir({ shouldLog: true })}/gen/node_headers`,
8983
);
90-
const env = {
84+
const env: NodeJS.ProcessEnv = {
9185
...process.env,
92-
CXXFLAGS,
86+
CXXFLAGS: process.env.CXXFLAGS,
9387
npm_config_nodedir: nodeDir,
9488
npm_config_msvs_version: "2019",
9589
npm_config_yes: "true",

0 commit comments

Comments
 (0)