cc-wrapper: Pass shellcheck and other cleanups #27879
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,37 @@ | ||
| # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. | ||
| export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" | ||
|
|
||
| # Export and assign separately in order that a failing $(..) will fail | ||
| # the script. | ||
|
|
||
| if [ -e @out@/nix-support/libc-cflags ]; then | ||
| export NIX_CFLAGS_COMPILE | ||
| NIX_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" | ||
| fi | ||
|
|
||
| if [ -e @out@/nix-support/cc-cflags ]; then | ||
| export NIX_CFLAGS_COMPILE | ||
| NIX_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE" | ||
| fi | ||
|
|
||
| if [ -e @out@/nix-support/gnat-cflags ]; then | ||
| export NIX_GNATFLAGS_COMPILE | ||
| NIX_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE" | ||
| fi | ||
|
|
||
| if [ -e @out@/nix-support/libc-ldflags ]; then | ||
| export NIX_LDFLAGS | ||
| NIX_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" | ||
| fi | ||
|
|
||
| if [ -e @out@/nix-support/cc-ldflags ]; then | ||
| export NIX_LDFLAGS | ||
| NIX_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" | ||
| fi | ||
|
|
||
| if [ -e @out@/nix-support/libc-ldflags-before ]; then | ||
| export NIX_LDFLAGS_BEFORE | ||
| NIX_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" | ||
| fi | ||
|
|
||
| export NIX_CC_WRAPPER_FLAGS_SET=1 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,14 @@ | ||
| #! @shell@ | ||
| set -e -o pipefail | ||
| shopt -s nullglob | ||
|
|
||
| path_backup="$PATH" | ||
|
|
||
| # That @-vars are substituted separately from bash evaluation makes | ||
| # shellcheck think this, and others like it, are useless conditionals. | ||
| # shellcheck disable=SC2157 | ||
| if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then | ||
| PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" | ||
| fi | ||
|
|
||
| if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then | ||
|
|
@@ -19,16 +26,17 @@ source @out@/nix-support/utils.sh | |
| # For instance, figure out if linker flags should be passed. | ||
| # GCC prints annoying warnings when they are not needed. | ||
| dontLink=0 | ||
|
||
| nonFlagArgs=0 | ||
| # shellcheck disable=SC2193 | ||
| [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 | ||
| cppInclude=1 | ||
|
|
||
| expandResponseParams "$@" | ||
| declare -i n=0 | ||
| nParams=${#params[@]} | ||
| while [ "$n" -lt "$nParams" ]; do | ||
| p=${params[n]} | ||
| p2=${params[n+1]} | ||
| if [ "$p" = -c ]; then | ||
| dontLink=1 | ||
| elif [ "$p" = -S ]; then | ||
|
|
@@ -55,10 +63,10 @@ while [ $n -lt ${#params[*]} ]; do | |
| nonFlagArgs=1 | ||
| elif [ "$p" = -m32 ]; then | ||
| if [ -e @out@/nix-support/dynamic-linker-m32 ]; then | ||
| NIX_LDFLAGS+=" -dynamic-linker $(< @out@/nix-support/dynamic-linker-m32)" | ||
| fi | ||
| fi | ||
| n+=1 | ||
| done | ||
|
|
||
| # If we pass a flag like -Wl, then gcc will call the linker unless it | ||
|
|
@@ -71,26 +79,27 @@ if [ "$nonFlagArgs" = 0 ]; then | |
| fi | ||
|
|
||
| # Optionally filter out paths not refering to the store. | ||
| if [[ "$NIX_ENFORCE_PURITY" = 1 && -n "$NIX_STORE" ]]; then | ||
| rest=() | ||
| nParams=${#params[@]} | ||
| declare -i n=0 | ||
| while [ "$n" -lt "$nParams" ]; do | ||
| p=${params[n]} | ||
| p2=${params[n+1]} | ||
| if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then | ||
| skip "${p:2}" | ||
| elif [ "$p" = -L ] && badPath "$p2"; then | ||
| n+=1; skip "$p2" | ||
| elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then | ||
| skip "${p:2}" | ||
| elif [ "$p" = -I ] && badPath "$p2"; then | ||
| n+=1; skip "$p2" | ||
| elif [ "$p" = -isystem ] && badPath "$p2"; then | ||
| n+=1; skip "$p2" | ||
| else | ||
| rest+=("$p") | ||
| fi | ||
| n+=1 | ||
| done | ||
| params=("${rest[@]}") | ||
| fi | ||
|
|
@@ -99,11 +108,11 @@ fi | |
| # Clear march/mtune=native -- they bring impurity. | ||
| if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then | ||
| rest=() | ||
| for p in "${params[@]}"; do | ||
| if [[ "$p" = -m*=native ]]; then | ||
| skip "$p" | ||
| else | ||
| rest+=("$p") | ||
| fi | ||
| done | ||
| params=("${rest[@]}") | ||
|
|
@@ -116,23 +125,22 @@ if [[ "$isCpp" = 1 ]]; then | |
| NIX_CFLAGS_LINK+=" $NIX_CXXSTDLIB_LINK" | ||
| fi | ||
|
|
||
|
Member
Author
There was a problem hiding this comment. This would be the unwrapped |
||
| source @out@/nix-support/add-hardening.sh | ||
|
|
||
| # Add the flags for the C compiler proper. | ||
| extraAfter=($NIX_CFLAGS_COMPILE "${hardeningCFlags[@]}") | ||
| extraBefore=() | ||
|
|
||
| if [ "$dontLink" != 1 ]; then | ||
|
|
||
| # Add the flags that should only be passed to the compiler when | ||
| # linking. | ||
| extraAfter+=($NIX_CFLAGS_LINK "${hardeningLDFlags[@]}") | ||
|
|
||
| # Add the flags that should be passed to the linker (and prevent | ||
| # `ld-wrapper' from adding NIX_LDFLAGS again). | ||
| for i in $NIX_LDFLAGS_BEFORE; do | ||
| extraBefore+=("-Wl,$i") | ||
| done | ||
| for i in $NIX_LDFLAGS; do | ||
| if [ "${i:0:3}" = -L/ ]; then | ||
|
|
@@ -155,23 +163,17 @@ fi | |
|
|
||
| # Optionally print debug info. | ||
| if [ -n "$NIX_DEBUG" ]; then | ||
| echo "extra flags before to @prog@:" >&2 | ||
| printf " %q\n" "${extraBefore[@]}" >&2 | ||
| echo "original flags to @prog@:" >&2 | ||
| printf " %q\n" "${params[@]}" >&2 | ||
| echo "extra flags after to @prog@:" >&2 | ||
| printf " %q\n" "${extraAfter[@]}" >&2 | ||
| fi | ||
|
|
||
| if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then | ||
| source "$NIX_CC_WRAPPER_EXEC_HOOK" | ||
| fi | ||
|
|
||
| PATH="$path_backup" | ||
| exec @prog@ "${extraBefore[@]}" "${params[@]}" "${extraAfter[@]}" | ||
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added back better comment without typo.