Harden kernel sccache dir setup
This commit is contained in:
parent
a2e09699a6
commit
8087397b99
1 changed files with 4 additions and 4 deletions
|
|
@ -74,7 +74,7 @@ let
|
||||||
size = "100G"
|
size = "100G"
|
||||||
'';
|
'';
|
||||||
sccacheSetup = lib.optionalString enforceSccache ''
|
sccacheSetup = lib.optionalString enforceSccache ''
|
||||||
# mkdir -p ${lib.escapeShellArg sccacheDir}
|
mkdir -p ${lib.escapeShellArg sccacheDir} 2>/dev/null || true
|
||||||
export SCCACHE_CONF=${lib.escapeShellArg sccacheConfig}
|
export SCCACHE_CONF=${lib.escapeShellArg sccacheConfig}
|
||||||
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
|
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
|
||||||
'';
|
'';
|
||||||
|
|
@ -83,7 +83,7 @@ let
|
||||||
name: compiler:
|
name: compiler:
|
||||||
pkgs.writeShellScriptBin name ''
|
pkgs.writeShellScriptBin name ''
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
# mkdir -p ${lib.escapeShellArg sccacheDir}
|
mkdir -p ${lib.escapeShellArg sccacheDir} 2>/dev/null || true
|
||||||
export SCCACHE_CONF=${lib.escapeShellArg sccacheConfig}
|
export SCCACHE_CONF=${lib.escapeShellArg sccacheConfig}
|
||||||
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
|
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
|
||||||
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
|
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
|
||||||
|
|
@ -97,7 +97,7 @@ let
|
||||||
hostcxxSccache = mkSccacheWrapper "c++" realHostCXX;
|
hostcxxSccache = mkSccacheWrapper "c++" realHostCXX;
|
||||||
rustcSccache = pkgs.writeShellScriptBin "rustc" ''
|
rustcSccache = pkgs.writeShellScriptBin "rustc" ''
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
# mkdir -p ${lib.escapeShellArg sccacheDir}
|
mkdir -p ${lib.escapeShellArg sccacheDir} 2>/dev/null || true
|
||||||
export SCCACHE_CONF=${lib.escapeShellArg sccacheConfig}
|
export SCCACHE_CONF=${lib.escapeShellArg sccacheConfig}
|
||||||
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
|
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
|
||||||
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
|
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
|
||||||
|
|
@ -108,7 +108,7 @@ let
|
||||||
|
|
||||||
hostrustcSccache = pkgs.writeShellScriptBin "rustc" ''
|
hostrustcSccache = pkgs.writeShellScriptBin "rustc" ''
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
# mkdir -p ${lib.escapeShellArg sccacheDir}
|
mkdir -p ${lib.escapeShellArg sccacheDir} 2>/dev/null || true
|
||||||
export SCCACHE_CONF=${lib.escapeShellArg sccacheConfig}
|
export SCCACHE_CONF=${lib.escapeShellArg sccacheConfig}
|
||||||
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
|
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
|
||||||
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
|
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue