Skip to content

Commit 6ffafc7

Browse files
vcunatvcunat
committedNov 7, 2017
Merge branch 'staging'
Main change: glibc: 2.25-x -> 2.26-y, containing security fixes, and various features and deprecations. Unfortunately, some of the latter still cause (transitively) a couple hundred newly failing jobs. I'm not delaying anymore, so that we have the security fix on master. I mainly patched gcc, llvm and icu, but I can't fix everything...
·
branch-off-24.1118.03-beta
2 parents 4db6d35 + f04b64c commit 6ffafc7

File tree

61 files changed

+1082
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1082
-364
lines changed
 

‎pkgs/build-support/cc-wrapper/cc-wrapper.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! @shell@
2-
set -eu -o pipefail
2+
set -eu -o pipefail +o posix
33
shopt -s nullglob
44

55
if (( "${NIX_DEBUG:-0}" >= 7 )); then

‎pkgs/build-support/cc-wrapper/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ stdenv.mkDerivation {
286286
*) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
287287
esac
288288
289-
if [ -n "$dynamicLinker" ]; then
289+
if [ -n "''${dynamicLinker:-}" ]; then
290290
echo $dynamicLinker > $out/nix-support/dynamic-linker
291291
292292
'' + (if targetPlatform.isDarwin then ''

0 commit comments

Comments
 (0)
Please sign in to comment.