diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-19 11:41:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 11:41:44 +0300 |
| commit | f36165c2f14d8b82a5e10174afc38edd126a2fa7 (patch) | |
| tree | 6c78fc7c148dbbd5943344d1b0b008d87f293789 /pkgs/build-support/cc-wrapper | |
| parent | 234c077d43e66b4e62ee0f6c97f4991a0e6fbc82 (diff) | |
| parent | e08ce498f03f12ae155b29a35c24adb26d4e8888 (diff) | |
Merge pull request #253116 from pwaller/fix-static-linktype
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 9dcd29c644316..6c43f8cbfa6d2 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -31,7 +31,6 @@ cxxLibrary=1 cInclude=1 expandResponseParams "$@" -linkType=$(checkLinkType "${params[@]}") declare -ag positionalArgs=() declare -i n=0 @@ -175,6 +174,7 @@ extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_CFLAGS_ extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@) if [ "$dontLink" != 1 ]; then + linkType=$(checkLinkType $NIX_LDFLAGS_BEFORE_@suffixSalt@ "${params[@]}" ${NIX_CFLAGS_LINK_@suffixSalt@:-} $NIX_LDFLAGS_@suffixSalt@) # Add the flags that should only be passed to the compiler when # linking. |