diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-05 20:34:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-05 20:34:08 +0200 |
| commit | b4729bad3d1c1c78dbd47634a1efba388c89dbbb (patch) | |
| tree | 4ec7677a3559c38d53118bdbf7f797411741546d /pkgs/stdenv | |
| parent | 0e141f0382685c8ec32a28b84f6edd274ebd0ae9 (diff) | |
| parent | 6427998d85dffc8d3cd724f358ed4af8e4961398 (diff) | |
| download | nixpkgs-b4729bad3d1c1c78dbd47634a1efba388c89dbbb.tar nixpkgs-b4729bad3d1c1c78dbd47634a1efba388c89dbbb.tar.gz nixpkgs-b4729bad3d1c1c78dbd47634a1efba388c89dbbb.tar.bz2 nixpkgs-b4729bad3d1c1c78dbd47634a1efba388c89dbbb.tar.lz nixpkgs-b4729bad3d1c1c78dbd47634a1efba388c89dbbb.tar.xz nixpkgs-b4729bad3d1c1c78dbd47634a1efba388c89dbbb.tar.zst nixpkgs-b4729bad3d1c1c78dbd47634a1efba388c89dbbb.zip | |
Merge #165406: staging-next 2022-03-23
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0777fa830c1..350fff48252 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -143,14 +143,14 @@ exitHandler() { echo "build failed with exit code $exitCode (ignored)" mkdir -p "$out/nix-support" printf "%s" "$exitCode" > "$out/nix-support/failed" - exit 0 + return 0 fi else runHook exitHook fi - exit "$exitCode" + return "$exitCode" } trap "exitHandler" EXIT diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 84b63e7b8fd..1d6ebe6284f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -74,6 +74,9 @@ in with pkgs; rec { cp -d ${libc.out}/lib/libresolv*.so* $out/lib cp -d ${libc.out}/lib/crt?.o $out/lib + # Hacky compat with our current unpack-bootstrap-tools.sh + ln -s librt.so "$out"/lib/librt-dummy.so + cp -rL ${libc.dev}/include $out chmod -R u+w "$out" |