Skip to content

Commit 1499678

Browse files
committed
Check link type based on expanded parameters
So far we've ignored response files in arguments, and did not check linkType against expanded parameters. This means if we have `-static` in a @reponse-file, linkType will not be set to `-static` as we never check against the expanded arguments from response files.
1 parent 4ef6469 commit 1499678

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

pkgs/build-support/bintools-wrapper/ld-wrapper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ expandResponseParams "$@"
3030
if [[ -n "${NIX_LINK_TYPE_@suffixSalt@:-}" ]]; then
3131
linkType=$NIX_LINK_TYPE_@suffixSalt@
3232
else
33-
linkType=$(checkLinkType "$@")
33+
linkType=$(checkLinkType "${params[@]}")
3434
fi
3535

3636
if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cxxLibrary=1
3131
cInclude=1
3232

3333
expandResponseParams "$@"
34-
linkType=$(checkLinkType "$@")
34+
linkType=$(checkLinkType "${params[@]}")
3535

3636
declare -i n=0
3737
nParams=${#params[@]}

0 commit comments

Comments
 (0)