commit bec5ffee155fd8dc9481d8eea45d788baee9bd46 · pyrox.dev/nixpkgs

+3

lib/systems/parse.nix

···

       83
       83
        
           solaris = { execFormat = elf;     families = { inherit unix; }; };

     

       84
       84
        
           windows = { execFormat = pe;      families = { }; };

     

       85
       85
        
         } // { # aliases

     

       86
       86
       +
           # TODO(@Ericson2314): Handle these Darwin version suffixes more generally.

     

       87
       87
       +
           darwin10 = kernels.darwin;

     

       88
       88
       +
           darwin14 = kernels.darwin;

     

       86
       89
        
           win32 = kernels.windows;

     

       87
       90
        
         };

     

       88
       91

+3

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

···

       78
       78
        
             withArch +

     

       79
       79
        
             withCpu +

     

       80
       80
        
             withAbi +

     

       81
       81
       +
             # Ensure that -print-prog-name is able to find the correct programs.

     

       82
       82
       +
             " --with-as=${binutils}/bin/${cross.config}-as" +

     

       83
       83
       +
             " --with-ld=${binutils}/bin/${cross.config}-ld" +

     

       81
       84
        
             (if crossMingw && crossStageStatic then

     

       82
       85
        
               " --with-headers=${libcCross}/include" +

     

       83
       86
        
               " --with-gcc" +

+3 -4

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

···

       143
       143
        
               withFpu +

     

       144
       144
        
               withFloat +

     

       145
       145
        
               withMode +

     

       146
       146
       +
               # Ensure that -print-prog-name is able to find the correct programs.

     

       147
       147
       +
               " --with-as=${binutils}/bin/${cross.config}-as" +

     

       148
       148
       +
               " --with-ld=${binutils}/bin/${cross.config}-ld" +

     

       146
       149
        
               (if crossMingw && crossStageStatic then

     

       147
       150
        
                 " --with-headers=${libcCross}/include" +

     

       148
       151
        
                 " --with-gcc" +

     
···

       169
       172
        
                 (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"

     

       170
       173
        
                  else                " --with-headers=${libcCross.dev}/include") +

     

       171
       174
        
                 # Ensure that -print-prog-name is able to find the correct programs.

     

       172
       172
       -
                 (stdenv.lib.optionalString (crossMingw || crossDarwin) (

     

       173
       173
       -
                   " --with-as=${binutils}/bin/${cross.config}-as" +

     

       174
       174
       -
                   " --with-ld=${binutils}/bin/${cross.config}-ld"

     

       175
       175
       -
                 )) +

     

       176
       175
        
                 " --enable-__cxa_atexit" +

     

       177
       176
        
                 " --enable-long-long" +

     

       178
       177
        
                 (if crossMingw then

+3 -5

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

···

       145
       145
        
               withFpu +

     

       146
       146
        
               withFloat +

     

       147
       147
        
               withMode +

     

       148
       148
       +
               # Ensure that -print-prog-name is able to find the correct programs.

     

       149
       149
       +
               " --with-as=${binutils}/bin/${cross.config}-as" +

     

       150
       150
       +
               " --with-ld=${binutils}/bin/${cross.config}-ld" +

     

       148
       151
        
               (if crossMingw && crossStageStatic then

     

       149
       152
        
                 " --with-headers=${libcCross}/include" +

     

       150
       153
        
                 " --with-gcc" +

     
···

       169
       172
        
                 else

     

       170
       173
        
                 (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"

     

       171
       174
        
                  else                " --with-headers=${libcCross.dev}/include") +

     

       172
       172
       -
                 # Ensure that -print-prog-name is able to find the correct programs.

     

       173
       173
       -
                 (stdenv.lib.optionalString (crossMingw || crossDarwin) (

     

       174
       174
       -
                   " --with-as=${binutils}/bin/${cross.config}-as" +

     

       175
       175
       -
                   " --with-ld=${binutils}/bin/${cross.config}-ld"

     

       176
       176
       -
                 )) +

     

       177
       175
        
                 " --enable-__cxa_atexit" +

     

       178
       176
        
                 " --enable-long-long" +

     

       179
       177
        
                 (if crossMingw then

+3 -5

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

···

       149
       149
        
               withFpu +

     

       150
       150
        
               withFloat +

     

       151
       151
        
               withMode +

     

       152
       152
       +
               # Ensure that -print-prog-name is able to find the correct programs.

     

       153
       153
       +
               " --with-as=${binutils}/bin/${cross.config}-as" +

     

       154
       154
       +
               " --with-ld=${binutils}/bin/${cross.config}-ld" +

     

       152
       155
        
               (if crossMingw && crossStageStatic then

     

       153
       156
        
                 " --with-headers=${libcCross}/include" +

     

       154
       157
        
                 " --with-gcc" +

     
···

       173
       176
        
                 else

     

       174
       177
        
                 (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"

     

       175
       178
        
                  else                " --with-headers=${getDev libcCross}/include") +

     

       176
       176
       -
                 # Ensure that -print-prog-name is able to find the correct programs.

     

       177
       177
       -
                 (stdenv.lib.optionalString (crossMingw || crossDarwin) (

     

       178
       178
       -
                   " --with-as=${binutils}/bin/${cross.config}-as" +

     

       179
       179
       -
                   " --with-ld=${binutils}/bin/${cross.config}-ld"

     

       180
       180
       -
                 )) +

     

       181
       179
        
                 " --enable-__cxa_atexit" +

     

       182
       180
        
                 " --enable-long-long" +

     

       183
       181
        
                 (if crossMingw then

+3 -5

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

···

       145
       145
        
               withFpu +

     

       146
       146
        
               withFloat +

     

       147
       147
        
               withMode +

     

       148
       148
       +
               # Ensure that -print-prog-name is able to find the correct programs.

     

       149
       149
       +
               " --with-as=${binutils}/bin/${cross.config}-as" +

     

       150
       150
       +
               " --with-ld=${binutils}/bin/${cross.config}-ld" +

     

       148
       151
        
               (if crossMingw && crossStageStatic then

     

       149
       152
        
                 " --with-headers=${libcCross}/include" +

     

       150
       153
        
                 " --with-gcc" +

     
···

       169
       172
        
                 else

     

       170
       173
        
                 (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"

     

       171
       174
        
                  else                " --with-headers=${getDev libcCross}/include") +

     

       172
       172
       -
                 # Ensure that -print-prog-name is able to find the correct programs.

     

       173
       173
       -
                 (stdenv.lib.optionalString (crossMingw || crossDarwin) (

     

       174
       174
       -
                   " --with-as=${binutils}/bin/${cross.config}-as" +

     

       175
       175
       -
                   " --with-ld=${binutils}/bin/${cross.config}-ld"

     

       176
       176
       -
                 )) +

     

       177
       175
        
                 " --enable-__cxa_atexit" +

     

       178
       176
        
                 " --enable-long-long" +

     

       179
       177
        
                 (if crossMingw then

+3 -4

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

···

       145
       145
        
               withFpu +

     

       146
       146
        
               withFloat +

     

       147
       147
        
               withMode +

     

       148
       148
       +
               # Ensure that -print-prog-name is able to find the correct programs.

     

       149
       149
       +
               " --with-as=${binutils}/bin/${cross.config}-as" +

     

       150
       150
       +
               " --with-ld=${binutils}/bin/${cross.config}-ld" +

     

       148
       151
        
               (if crossMingw && crossStageStatic then

     

       149
       152
        
                 " --with-headers=${libcCross}/include" +

     

       150
       153
        
                 " --with-gcc" +

     
···

       170
       173
        
                 (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"

     

       171
       174
        
                  else                " --with-headers=${getDev libcCross}/include") +

     

       172
       175
        
                 # Ensure that -print-prog-name is able to find the correct programs.

     

       173
       173
       -
                 (stdenv.lib.optionalString (crossMingw || crossDarwin) (

     

       174
       174
       -
                   " --with-as=${binutils}/bin/${cross.config}-as" +

     

       175
       175
       -
                   " --with-ld=${binutils}/bin/${cross.config}-ld"

     

       176
       176
       -
                 )) +

     

       177
       176
        
                 " --enable-__cxa_atexit" +

     

       178
       177
        
                 " --enable-long-long" +

     

       179
       178
        
                 (if crossMingw then

+3 -2

pkgs/development/tools/misc/binutils/default.nix

···

       7
       7
        
       let inherit (stdenv.lib) optional optionals optionalString; in

     

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
       -
         name = basename + optionalString (cross != null) "-${cross.config}";

     

       10
       10
       +
         name = optionalString (cross != null) "${cross.config}-" + basename;

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "mirror://gnu/binutils/${basename}.tar.bz2";

     
···

       40
       40
        
           ./no-plugins.patch

     

       41
       41
        
         ];

     

       42
       42
        
       

     

       43
       43
       +
         # TODO: all outputs on all platform

     

       43
       44
        
         outputs = [ "out" ]

     

       44
       45
        
           ++ optional (cross == null && !stdenv.isDarwin) "lib" # problems in Darwin stdenv

     

       45
       46
        
           ++ [ "info" ]

     
···

       75
       76
        
         configureFlags =

     

       76
       77
        
           [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]

     

       77
       78
        
           ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"

     

       78
       78
       -
           ++ optional (cross != null) "--target=${cross.config}"

     

       79
       79
       +
           ++ optional (cross != null) "--target=${cross.config}" # TODO: make this unconditional

     

       79
       80
        
           ++ optionals gold [ "--enable-gold" "--enable-plugins" ]

     

       80
       81
        
           ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu";

     

       81
       82

+19 -5

pkgs/os-specific/darwin/binutils/default.nix

···

       1
       1
       -
       { stdenv, binutils-raw, cctools }:

     

       1
       1
       +
       { stdenv, binutils-raw, cctools

     

       2
       2
       +
       , hostPlatform, targetPlatform

     

       3
       3
       +
       }:

     

       2
       4
        
       

     

       5
       5
       +
       let

     

       6
       6
       +
         prefix = stdenv.lib.optionalString

     

       7
       7
       +
           (targetPlatform != hostPlatform)

     

       8
       8
       +
           "${targetPlatform.config}-";

     

       9
       9
       +
       

     

       10
       10
       +
         cmds = [

     

       11
       11
       +
           "ar" "ranlib" "as" "dsymutil" "install_name_tool"

     

       12
       12
       +
           "ld" "strip" "otool" "lipo" "nm" "strings" "size"

     

       13
       13
       +
         ];

     

       14
       14
       +
       in

     

       15
       15
       +
       

     

       16
       16
       +
       # TODO loop over prefixed binaries too

     

       3
       17
        
       stdenv.mkDerivation {

     

       4
       4
       -
         name = "cctools-binutils-darwin";

     

       18
       18
       +
         name = "${prefix}cctools-binutils-darwin";

     

       5
       19
        
         buildCommand = ''

     

       6
       20
        
           mkdir -p $out/bin $out/include

     

       7
       21
        
       

     

       8
       8
       -
           ln -s ${binutils-raw.out}/bin/c++filt $out/bin/c++filt

     

       22
       22
       +
           ln -s ${binutils-raw.out}/bin/${prefix}c++filt $out/bin/${prefix}c++filt

     

       9
       23
        
       

     

       10
       24
        
           # We specifically need:

     

       11
       25
        
           # - ld: binutils doesn't provide it on darwin

     
···

       18
       32
        
           # - strip: the binutils one seems to break mach-o files

     

       19
       33
        
           # - lipo: gcc build assumes it exists

     

       20
       34
        
           # - nm: the gnu one doesn't understand many new load commands

     

       21
       21
       -
           for i in ar ranlib as dsymutil install_name_tool ld strip otool lipo nm strings size; do

     

       35
       35
       +
           for i in ${stdenv.lib.concatStringsSep " " (builtins.map (e: prefix + e) cmds)}; do

     

       22
       36
        
             ln -sf "${cctools}/bin/$i" "$out/bin/$i"

     

       23
       37
        
           done

     

       24
       38
        
       

     

       25
       25
       -
           for i in ${binutils-raw.dev}/include/*.h; do

     

       39
       39
       +
           for i in ${binutils-raw.dev or binutils-raw.out}/include/*.h; do

     

       26
       40
        
             ln -s "$i" "$out/include/$(basename $i)"

     

       27
       41
        
           done

     

       28
       42

+42 -28

pkgs/os-specific/darwin/cctools/port.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub, autoconf, automake, libtool_2

     

       1
       1
       +
       { stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2

     

       2
       2
        
       , llvm, libcxx, libcxxabi, clang, libuuid

     

       3
       3
       -
       , libobjc ? null

     

       3
       3
       +
       , libobjc ? null, maloader ? null, xctoolchain ? null

     

       4
       4
       +
       , buildPlatform, hostPlatform, targetPlatform

     

       4
       5
        
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         inherit (stdenv.lib.systems.parse) isDarwin;

     

       9
       9
       +
       

     

       10
       10
       +
         prefix = stdenv.lib.optionalString

     

       11
       11
       +
           (targetPlatform != hostPlatform)

     

       12
       12
       +
           "${targetPlatform.config}-";

     

       13
       13
       +
       in

     

       14
       14
       +
       

     

       15
       15
       +
       assert isDarwin targetPlatform.parsed;

     

       16
       16
       +
       

     

       17
       17
       +
       # Non-Darwin alternatives

     

       18
       18
       +
       assert (!isDarwin hostPlatform.parsed) -> (maloader != null && xctoolchain != null);

     

       5
       19
        
       

     

       6
       20
        
       let

     

       7
       21
        
         baseParams = rec {

     

       8
       8
       -
           name = "cctools-port-${version}";

     

       22
       22
       +
           name = "${prefix}cctools-port-${version}";

     

       9
       23
        
           version = "895";

     

       10
       24
        
       

     

       11
       25
        
           src = fetchFromGitHub {

     
···

       26
       40
        
       

     

       27
       41
        
           enableParallelBuilding = true;

     

       28
       42
        
       

     

       29
       29
       -
           configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [ "CXXFLAGS=-I${libcxx}/include/c++/v1" ];

     

       43
       43
       +
           configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [

     

       44
       44
       +
             "CXXFLAGS=-I${libcxx}/include/c++/v1"

     

       45
       45
       +
           ] ++ stdenv.lib.optionals (targetPlatform != buildPlatform) [

     

       46
       46
       +
             # TODO make unconditional next hash break

     

       47
       47
       +
             "--build=${buildPlatform.config}"

     

       48
       48
       +
             "--host=${hostPlatform.config}"

     

       49
       49
       +
             "--target=${targetPlatform.config}"

     

       50
       50
       +
           ];

     

       30
       51
        
       

     

       31
       52
        
           postPatch = ''

     

       32
       53
        
             sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp

     
···

       69
       90
        
             popd

     

       70
       91
        
           '';

     

       71
       92
        
       

     

       93
       93
       +
           postInstall =

     

       94
       94
       +
             if isDarwin hostPlatform.parsed

     

       95
       95
       +
             then ''

     

       96
       96
       +
               cat >$out/bin/dsymutil << EOF

     

       97
       97
       +
               #!${stdenv.shell}

     

       98
       98
       +
               EOF

     

       99
       99
       +
               chmod +x $out/bin/dsymutil

     

       100
       100
       +
             ''

     

       101
       101
       +
             else ''

     

       102
       102
       +
               for tool in dyldinfo dwarfdump dsymutil; do

     

       103
       103
       +
                 ${makeWrapper}/bin/makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${targetPlatform.config}-$tool" \

     

       104
       104
       +
                   --add-flags "${xctoolchain}/bin/$tool"

     

       105
       105
       +
                 ln -s "$out/bin/${targetPlatform.config}-$tool" "$out/bin/$tool"

     

       106
       106
       +
               done

     

       107
       107
       +
             '';

     

       108
       108
       +
       

     

       72
       109
        
           meta = {

     

       73
       110
        
             homepage = "http://www.opensource.apple.com/source/cctools/";

     

       74
       111
        
             description = "Mac OS X Compiler Tools (cross-platform port)";

     

       75
       112
        
             license = stdenv.lib.licenses.apsl20;

     

       76
       113
        
           };

     

       77
       114
        
         };

     

       78
       78
       -
       in {

     

       79
       79
       -
         native = stdenv.mkDerivation (baseParams // {

     

       80
       80
       -
           # A hack for now...

     

       81
       81
       -
           postInstall = ''

     

       82
       82
       -
             cat >$out/bin/dsymutil << EOF

     

       83
       83
       -
             #!${stdenv.shell}

     

       84
       84
       -
             EOF

     

       85
       85
       -
             chmod +x $out/bin/dsymutil

     

       86
       86
       -
           '';

     

       87
       87
       -
         });

     

       88
       88
       -
       

     

       89
       89
       -
         cross =

     

       90
       90
       -
           { cross, maloader, makeWrapper, xctoolchain}: stdenv.mkDerivation (baseParams // {

     

       91
       91
       -
             configureFlags = baseParams.configureFlags ++ [ "--target=${cross.config}" ];

     

       92
       92
       -
       

     

       93
       93
       -
             postInstall = ''

     

       94
       94
       -
               for tool in dyldinfo dwarfdump dsymutil; do

     

       95
       95
       -
                 ${makeWrapper}/bin/makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${cross.config}-$tool" \

     

       96
       96
       -
                   --add-flags "${xctoolchain}/bin/$tool"

     

       97
       97
       -
                 ln -s "$out/bin/${cross.config}-$tool" "$out/bin/$tool"

     

       98
       98
       -
               done

     

       99
       99
       -
             '';

     

       100
       100
       -
           });

     

       101
       101
       -
       }

     

       115
       115
       +
       in stdenv.mkDerivation baseParams

+3 -3

pkgs/stdenv/linux/make-bootstrap-tools-cross.nix

···

       146
       146
        
       

     

       147
       147
        
         build =

     

       148
       148
        
       

     

       149
       149
       -
           pkgs.buildPackages.stdenv.mkDerivation {

     

       149
       149
       +
           pkgs.stdenv.mkDerivation {

     

       150
       150
        
             name = "stdenv-bootstrap-tools-cross";

     

       151
       151
        
             crossConfig = pkgs.hostPlatform.config;

     

       152
       152
        
       

     

       153
       153
       -
             buildInputs = [

     

       153
       153
       +
             nativeBuildInputs = [

     

       154
       154
        
               pkgs.buildPackages.nukeReferences

     

       155
       155
        
               pkgs.buildPackages.cpio

     

       156
       156
        
               pkgs.buildPackages.binutils

     
···

       285
       285
        
             allowedReferences = [];

     

       286
       286
        
           };

     

       287
       287
        
       

     

       288
       288
       -
         dist = pkgs.buildPackages.stdenv.mkDerivation {

     

       288
       288
       +
         dist = pkgs.stdenv.mkDerivation {

     

       289
       289
        
           name = "stdenv-bootstrap-tools-cross";

     

       290
       290
        
       

     

       291
       291
        
           buildCommand = ''

+7 -8

pkgs/top-level/all-packages.nix

···

       6411
       6411
        
       

     

       6412
       6412
        
         bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { };

     

       6413
       6413
        
       

     

       6414
       6414
       -
         binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw;

     

       6414
       6414
       +
         binutils =

     

       6415
       6415
       +
           if lib.systems.parse.isDarwin targetPlatform.parsed

     

       6416
       6416
       +
           then darwin.binutils

     

       6417
       6417
       +
           else binutils-raw;

     

       6415
       6418
        
       

     

       6416
       6419
        
         binutils-raw = callPackage ../development/tools/misc/binutils {

     

       6417
       6420
        
           # FHS sys dirs presumably only have stuff for the build platform

     
···

       11462
       11465
        
         darwin = let

     

       11463
       11466
        
           apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { };

     

       11464
       11467
        
         in apple-source-releases // rec {

     

       11465
       11465
       -
           cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross {

     

       11466
       11466
       -
             cross = assert targetPlatform != buildPlatform; targetPlatform;

     

       11468
       11468
       +
           cctools = callPackage ../os-specific/darwin/cctools/port.nix {

     

       11469
       11469
       +
             inherit libobjc;

     

       11470
       11470
       +
             stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;

     

       11467
       11471
        
             inherit maloader;

     

       11468
       11472
        
             xctoolchain = xcode.toolchain;

     

       11469
       11473
        
           };

     

       11470
       11470
       -
       

     

       11471
       11471
       -
           cctools = (callPackage ../os-specific/darwin/cctools/port.nix {

     

       11472
       11472
       -
             inherit libobjc;

     

       11473
       11473
       -
             stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv;

     

       11474
       11474
       -
           }).native;

     

       11475
       11474
        
       

     

       11476
       11475
        
           cf-private = callPackage ../os-specific/darwin/cf-private {

     

       11477
       11476
        
             inherit (apple-source-releases) CF;

+24 -2

pkgs/top-level/release-cross.nix

···

       1
       1
       -
       { # The platforms for which we build Nixpkgs.

     

       2
       2
       -
         supportedSystems ? [ builtins.currentSystem ]

     

       1
       1
       +
       /* This file defines some basic smoke tests for cross compilation.

     

       2
       2
       +
       */

     

       3
       3
       +
       

     

       4
       4
       +
       { # The platforms *from* which we cross compile.

     

       5
       5
       +
         supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ]

     

       3
       6
        
       , # Strip most of attributes when evaluating to spare memory usage

     

       4
       7
        
         scrubJobs ? true

     

       5
       8
        
       }:

     
···

       83
       86
        
           guile = nativePlatforms;

     

       84
       87
        
         };

     

       85
       88
        
       

     

       89
       89
       +
         darwinToAarch64 = let

     

       90
       90
       +
           crossSystem = {

     

       91
       91
       +
             config = "aarch64-apple-darwin14";

     

       92
       92
       +
             arch = "arm64";

     

       93
       93
       +
             libc = "libSystem";

     

       94
       94
       +
           };

     

       95
       95
       +
         in mapTestOnCross crossSystem {

     

       96
       96
       +
           buildPackages.binutils = darwin;

     

       97
       97
       +
         };

     

       98
       98
       +
       

     

       99
       99
       +
         darwinToArm = let

     

       100
       100
       +
           crossSystem = {

     

       101
       101
       +
             config = "arm-apple-darwin10";

     

       102
       102
       +
             arch = "armv7-a";

     

       103
       103
       +
             libc = "libSystem";

     

       104
       104
       +
           };

     

       105
       105
       +
         in mapTestOnCross crossSystem {

     

       106
       106
       +
           buildPackages.binutils = darwin;

     

       107
       107
       +
         };

     

       86
       108
        
       

     

       87
       109
        
         /* Test some cross builds to the Sheevaplug */

     

       88
       110
        
         crossSheevaplugLinux = let