move CODEQL_RUNNER population to tracer-config.ts

github · Jan 12, 2021 · c796788 · c796788
1 parent cd2eafc
commit c796788
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/lib/runner.js b/lib/runner.js
diff --git a/lib/runner.js.map b/lib/runner.js.map
diff --git a/lib/tracer-config.js b/lib/tracer-config.js
diff --git a/lib/tracer-config.js.map b/lib/tracer-config.js.map
diff --git a/src/runner.ts b/src/runner.ts
@@ -203,17 +203,6 @@ program
         );
       }
 
-      // On macos it's necessary to prefix the build command with the runner exectuable
-      // on order to trace when System Integrity Protection is enabled.
-      // The exectuable also exists and works for other platforms so we output this env
-      // var with a path to the runner regardless so it's always available.
-      tracerConfig.env["CODEQL_RUNNER"] = path.join(
-        tracerConfig.env["CODEQL_DIST"],
-        "tools",
-        tracerConfig.env["CODEQL_PLATFORM"],
-        "runner"
-      );
-
       // Always output a json file of the env that can be consumed programmatically
       const jsonEnvFile = path.join(config.tempDir, codeqlEnvJsonFilename);
       fs.writeFileSync(jsonEnvFile, JSON.stringify(tracerConfig.env));

diff --git a/src/tracer-config.ts b/src/tracer-config.ts
@@ -185,5 +185,16 @@ export async function getCombinedTracerConfig(
     );
   }
 
+  // On macos it's necessary to prefix the build command with the runner exectuable
+  // on order to trace when System Integrity Protection is enabled.
+  // The exectuable also exists and works for other platforms so we output this env
+  // var with a path to the runner regardless so it's always available.
+  mainTracerConfig.env["CODEQL_RUNNER"] = path.join(
+    mainTracerConfig.env["CODEQL_DIST"],
+    "tools",
+    mainTracerConfig.env["CODEQL_PLATFORM"],
+    "runner"
+  );
+
   return mainTracerConfig;
 }