commit 89f8af55f11b01e68cbfc6d10537413140261721 · pyrox.dev/nixpkgs

+15 -8

pkgs/development/compilers/gcc/4.8/default.nix

···

       303
       303
        
               "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"

     

       304
       304
        
                \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}

     

       305
       305
        
           );

     

       306
       306
       -
           ${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit)

     

       307
       307
       -
             ''

     

       308
       308
       -
               export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`

     

       309
       309
       -
               export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"

     

       310
       310
       -
               export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

     

       311
       311
       -
               export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"

     

       312
       312
       -
             ''}

     

       313
       313
       -
           '';

     

       306
       306
       +
         '' + stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''

     

       307
       307
       +
           export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`

     

       308
       308
       +
           export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"

     

       309
       309
       +
           export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"

     

       310
       310
       +
           export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"

     

       311
       311
       +
         '' + stdenv.lib.optionalString stdenv.isDarwin ''

     

       312
       312
       +
           if xcodePath=$(/usr/bin/xcrun --show-sdk-path); then

     

       313
       313
       +
             configureFlagsArray+=(--with-native-system-header-dir=$xcodePath/usr/include)

     

       314
       314
       +
             makeFlagsArray+=( \

     

       315
       315
       +
              CFLAGS_FOR_BUILD=-F$xcodePath/System/Library/Frameworks \

     

       316
       316
       +
              CFLAGS_FOR_TARGET=-F$xcodePath/System/Library/Frameworks \

     

       317
       317
       +
              FLAGS_FOR_TARGET=-F$xcodePath/System/Library/Frameworks \

     

       318
       318
       +
             )

     

       319
       319
       +
           fi

     

       320
       320
       +
         '';

     

       314
       321
        
       

     

       315
       322
        
         dontDisableStatic = true;

     

       316
       323

+8 -1

pkgs/stdenv/nix/default.nix

···

       16
       16
        
               stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"

     

       17
       17
        
               xargsFlags=" "

     

       18
       18
        
             fi

     

       19
       19
       -
           '';

     

       19
       19
       +
           '' + (if stdenv.isDarwin then ''

     

       20
       20
       +
             export NIX_CFLAGS_COMPILE="--sysroot=/var/empty"

     

       21
       21
       +
             if xcodePath=$(/usr/bin/xcrun --show-sdk-path 2> /dev/null); then

     

       22
       22
       +
               NIX_CFLAGS_COMPILE+=" -idirafter $xcodePath/usr/include -F$xcodePath/System/Library/Frameworks"

     

       23
       23
       +
             else

     

       24
       24
       +
               NIX_CFLAGS_COMPILE+=" -idirafter /usr/include -F/System/Library/Frameworks"

     

       25
       25
       +
             fi

     

       26
       26
       +
           '' else "");

     

       20
       27
        
       

     

       21
       28
        
         initialPath = (import ../common-path.nix) {pkgs = pkgs;};

     

       22
       29