commit 61bbbcd1af1c3b5a365423f2ecc722a627ff353f · pyrox.dev/nixpkgs

+5

pkgs/build-support/bintools-wrapper/add-flags.sh

···

       3
       3
        
           NIX_IGNORE_LD_THROUGH_GCC

     

       4
       4
        
           NIX_LDFLAGS

     

       5
       5
        
           NIX_LDFLAGS_BEFORE

     

       6
       6
       +
           NIX_DYNAMIC_LINKER

     

       6
       7
        
           NIX_LDFLAGS_AFTER

     

       7
       8
        
           NIX_LDFLAGS_HARDEN

     

       8
       9
        
           NIX_HARDENING_ENABLE

     
···

       23
       24
        
       

     

       24
       25
        
       if [ -e @out@/nix-support/libc-ldflags ]; then

     

       25
       26
        
           NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/libc-ldflags)"

     

       27
       27
       +
       fi

     

       28
       28
       +
       

     

       29
       29
       +
       if [ -z "$NIX_DYNAMIC_LINKER_@suffixSalt@" ] && [ -e @out@/nix-support/ld-set-dynamic-linker ]; then

     

       30
       30
       +
           NIX_DYNAMIC_LINKER_@suffixSalt@="$(< @out@/nix-support/dynamic-linker)"

     

       26
       31
        
       fi

     

       27
       32
        
       

     

       28
       33
        
       if [ -e @out@/nix-support/libc-ldflags-before ]; then

+8 -13

pkgs/build-support/bintools-wrapper/default.nix

···

       237
       237
        
             if [ -n "''${dynamicLinker-}" ]; then

     

       238
       238
        
               echo $dynamicLinker > $out/nix-support/dynamic-linker

     

       239
       239
        
       

     

       240
       240
       -
           '' + (if targetPlatform.isDarwin then ''

     

       241
       241
       -
               printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook

     

       242
       242
       -
             '' else ''

     

       243
       243
       -
               if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then

     

       244
       244
       -
                 echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32

     

       245
       245
       -
               fi

     

       246
       246
       -
             ''

     

       247
       247
       -
             # The dynamic linker is passed in `ldflagsBefore' to allow

     

       248
       248
       -
             # explicit overrides of the dynamic linker by callers to ld

     

       249
       249
       -
             # (the *last* value counts, so ours should come first).

     

       250
       250
       -
             + ''

     

       251
       251
       -
               echo -dynamic-linker "$dynamicLinker" >> $out/nix-support/libc-ldflags-before

     

       252
       252
       -
           '') + ''

     

       240
       240
       +
               ${if targetPlatform.isDarwin then ''

     

       241
       241
       +
                 printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook

     

       242
       242
       +
               '' else ''

     

       243
       243
       +
                 if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then

     

       244
       244
       +
                   echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32

     

       245
       245
       +
                 fi

     

       246
       246
       +
                 touch $out/nix-support/ld-set-dynamic-linker

     

       247
       247
       +
               ''}

     

       253
       248
        
             fi

     

       254
       249
        
           '')

     

       255
       250

+12 -1

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

···

       20
       20
        
           source @out@/nix-support/add-flags.sh

     

       21
       21
        
       fi

     

       22
       22
        
       

     

       23
       23
       +
       setDynamicLinker=1

     

       23
       24
        
       

     

       24
       25
        
       # Optionally filter out paths not refering to the store.

     

       25
       26
        
       expandResponseParams "$@"

     
···

       47
       48
        
                   # Our ld is not built with sysroot support (Can we fix that?)

     

       48
       49
        
                   :

     

       49
       50
        
               else

     

       51
       51
       +
                   if [[ "$p" = -static || "$p" = -static-pie ]]; then

     

       52
       52
       +
                       # Using a dynamic linker for static binaries can lead to crashes.

     

       53
       53
       +
                       # This was observed for rust binaries.

     

       54
       54
       +
                       setDynamicLinker=0

     

       55
       55
       +
                   fi

     

       50
       56
        
                   rest+=("$p")

     

       51
       57
        
               fi

     

       52
       58
        
               n+=1

     
···

       63
       69
        
       if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then

     

       64
       70
        
           extraAfter+=($NIX_LDFLAGS_@suffixSalt@)

     

       65
       71
        
           extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@)

     

       72
       72
       +
           # By adding dynamic linker to extraBefore we allow the users set their

     

       73
       73
       +
           # own dynamic linker as NIX_LD_FLAGS will override earlier set flags

     

       74
       74
       +
           if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then

     

       75
       75
       +
               extraBefore+=("-dynamic-linker" "$NIX_DYNAMIC_LINKER_@suffixSalt@")

     

       76
       76
       +
           fi

     

       66
       77
        
       fi

     

       67
       78
        
       

     

       68
       79
        
       extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@)

     
···

       134
       145
        
           done

     

       135
       146
        
       fi

     

       136
       147
        
       

     

       137
       137
       -
       if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then

     

       148
       148
       +
       if [[ "$link32" = "1" && "$setDynamicLinker" = 1 && -e "@out@/nix-support/dynamic-linker-m32" ]]; then

     

       138
       149
        
           # We have an alternate 32-bit linker and we're producing a 32-bit ELF, let's

     

       139
       150
        
           # use it.

     

       140
       151
        
           extraAfter+=(

+6

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

···

       28
       28
        
       [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0

     

       29
       29
        
       cppInclude=1

     

       30
       30
        
       cInclude=1

     

       31
       31
       +
       setDynamicLinker=1

     

       31
       32
        
       

     

       32
       33
        
       expandResponseParams "$@"

     

       33
       34
        
       declare -i n=0

     
···

       58
       59
        
               cppInclude=0

     

       59
       60
        
           elif [ "$p" = -nostdinc++ ]; then

     

       60
       61
        
               cppInclude=0

     

       62
       62
       +
           elif [[ "$p" = -static || "$p" = -static-pie ]]; then

     

       63
       63
       +
               setDynamicLinker=0

     

       61
       64
        
           elif [[ "$p" != -?* ]]; then

     

       62
       65
        
               # A dash alone signifies standard input; it is not a flag

     

       63
       66
        
               nonFlagArgs=1

     
···

       152
       155
        
           for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do

     

       153
       156
        
               extraBefore+=("-Wl,$i")

     

       154
       157
        
           done

     

       158
       158
       +
           if [[ "$setDynamicLinker" = 1 && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then

     

       159
       159
       +
               extraBefore+=("-Wl,-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@")

     

       160
       160
       +
           fi

     

       155
       161
        
           for i in $NIX_LDFLAGS_@suffixSalt@; do

     

       156
       162
        
               if [ "${i:0:3}" = -L/ ]; then

     

       157
       163
        
                   extraAfter+=("$i")

+4 -1

pkgs/development/compilers/gcc/builder.sh

···

       37
       37
        
                   # Figure out what extra flags when linking to pass to the gcc

     

       38
       38
        
                   # compilers being generated to make sure that they use our libc.

     

       39
       39
        
                   extraLDFlags=($(< "${!curBintools}/nix-support/libc-ldflags") $(< "${!curBintools}/nix-support/libc-ldflags-before" || true))

     

       40
       40
       +
                   if [ -e ${!curBintools}/nix-support/ld-set-dynamic-linker ]; then

     

       41
       41
       +
                       extraLDFlags=-dynamic-linker=$(< ${!curBintools}/nix-support/dynamic-linker)

     

       42
       42
       +
                   fi

     

       40
       43
        
       

     

       41
       44
        
                   # The path to the Libc binaries such as `crti.o'.

     

       42
       45
        
                   libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib"

     
···

       252
       255
        
       

     

       253
       256
        
           if [[ targetConfig == *"linux"* ]]; then

     

       254
       257
        
               # For some reason, when building for linux on darwin, the libs retain

     

       255
       255
       -
       	# RPATH to $out.

     

       258
       258
       +
               # RPATH to $out.

     

       256
       259
        
               for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do

     

       257
       260
        
                   PREV_RPATH=`patchelf --print-rpath "$i"`

     

       258
       261
        
                   NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`

+19 -4

pkgs/test/cc-wrapper/default.nix

···

       1
       1
       -
       { stdenv }:

     

       1
       1
       +
       { stdenv, glibc }:

     

       2
       2
        
       with stdenv.lib;

     

       3
       3
        
       let

     

       4
       4
        
         # Sanitizers are not supported on Darwin.

     

       5
       5
        
         # Sanitizer headers aren't available in older libc++ stdenvs due to a bug

     

       6
       6
       -
         sanitizersWorking =

     

       7
       7
       -
              (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0")

     

       8
       8
       -
           || (stdenv.cc.isGNU && stdenv.isLinux);

     

       6
       6
       +
         sanitizersWorking = !stdenv.hostPlatform.isMusl && (

     

       7
       7
       +
           (stdenv.cc.isClang && versionAtLeast (getVersion stdenv.cc.name) "5.0.0")

     

       8
       8
       +
           || (stdenv.cc.isGNU && stdenv.isLinux)

     

       9
       9
       +
         );

     

       10
       10
       +
         staticLibc = optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";

     

       9
       11
        
       in stdenv.mkDerivation {

     

       10
       12
        
         name = "cc-wrapper-test";

     

       11
       13
        
       

     
···

       26
       28
        
             mkdir -p foo/lib

     

       27
       29
        
             $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c}

     

       28
       30
        
             ./core-foundation-check

     

       31
       31
       +
           ''}

     

       32
       32
       +
       

     

       33
       33
       +
       

     

       34
       34
       +
           ${optionalString (!stdenv.isDarwin) ''

     

       35
       35
       +
             printf "checking whether compiler builds valid static C binaries... " >&2

     

       36
       36
       +
             $CC ${staticLibc} -static -o cc-static ${./cc-main.c}

     

       37
       37
       +
             ./cc-static

     

       38
       38
       +
             # our glibc does not have pie enabled yet.

     

       39
       39
       +
             ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) ''

     

       40
       40
       +
               printf "checking whether compiler builds valid static pie C binaries... " >&2

     

       41
       41
       +
               $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c}

     

       42
       42
       +
               ./cc-static-pie

     

       43
       43
       +
             ''}

     

       29
       44
        
           ''}

     

       30
       45
        
       

     

       31
       46
        
           printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2