diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-12 22:20:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-12 22:20:31 +0100 |
| commit | 5e62091c4563fad93af79dc837a6b7694adc037e (patch) | |
| tree | da2fd3d32c580cfde11cf91065b58d50dc89b290 /pkgs/os-specific/linux/kernel | |
| parent | 504321761a9fc0b8edc4a0db832ddb043bf2d2fb (diff) | |
| parent | 3d24c5eeccf88bb86c632f27b3a2a41ccc9f9314 (diff) | |
| download | nixlib-5e62091c4563fad93af79dc837a6b7694adc037e.tar nixlib-5e62091c4563fad93af79dc837a6b7694adc037e.tar.gz nixlib-5e62091c4563fad93af79dc837a6b7694adc037e.tar.bz2 nixlib-5e62091c4563fad93af79dc837a6b7694adc037e.tar.lz nixlib-5e62091c4563fad93af79dc837a6b7694adc037e.tar.xz nixlib-5e62091c4563fad93af79dc837a6b7694adc037e.tar.zst nixlib-5e62091c4563fad93af79dc837a6b7694adc037e.zip | |
Merge #34882: linux: use absolute paths for compilers
This is needed to really build linux with gcc7 after ae040525d.
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 6210f5f79f38..3dae37136a2e 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -266,8 +266,10 @@ stdenv.mkDerivation ((drvAttrs config hostPlatform.platform kernelPatches config hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; + # Absolute paths for compilers avoid any PATH-clobbering issues. makeFlags = commonMakeFlags ++ [ - "HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc" + "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" "ARCH=${stdenv.hostPlatform.platform.kernelArch}" ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" |