diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index f5bcfc9f985..e6f5a5a9f7d 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + path_backup="$PATH" # That @-vars are substituted separately from bash evaluation makes diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 42df660211b..b15f1e461e5 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + # N.B. Gnat is not used during bootstrapping, so we don't need to # worry about the old bash empty array `set -u` workarounds. diff --git a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh index b0615731b28..88e644dc54d 100644 --- a/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnatlink-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + # N.B. Gnat is not used during bootstrapping, so we don't need to # worry about the old bash empty array `set -u` workarounds. diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh index 72c999ff8bc..5d81e34a047 100755 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + declare -a args=("$@") # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index a849df86ef0..355ea881898 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -2,6 +2,10 @@ set -eu -o pipefail shopt -s nullglob +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + path_backup="$PATH" # phase separation makes this look useless