Commit 3d64e7ed authored by Boey Maun Suang's avatar Boey Maun Suang
Browse files

gnat12: Add support for x86_64-darwin

parent c1308ac5

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

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ stdenv.mkDerivation ({ 


  preConfigure = (import ../common/pre-configure.nix {

    inherit lib;

    inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;

    inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;

  }) + ''

    ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h

  '';

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

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ stdenv.mkDerivation ({ 


  preConfigure = (import ../common/pre-configure.nix {

    inherit lib;

    inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;

    inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;

  }) + ''

    ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h

  '';

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

+4 −1
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ let majorVersion = "12"; 
        })

      ]



      # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin

      ++ optional (stdenv.isDarwin && langAda) ../ada-cctools-as-detection-configure.patch



      # Obtain latest patch with ../update-mcfgthread-patches.sh

      ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch;
@@ -227,7 +230,7 @@ stdenv.mkDerivation ({ 


  preConfigure = (import ../common/pre-configure.nix {

    inherit lib;

    inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;

    inherit version targetPlatform hostPlatform buildPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;

  }) + ''

    ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h

  '';

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

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ stdenv.mkDerivation ({ 


  preConfigure = import ../common/pre-configure.nix {

    inherit lib;

    inherit version targetPlatform hostPlatform langJava langGo crossStageStatic enableMultilib;

    inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib;

  };



  dontDisableStatic = true;

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

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ stdenv.mkDerivation ({ 


  preConfigure = import ../common/pre-configure.nix {

    inherit lib;

    inherit version targetPlatform hostPlatform langJava langGo crossStageStatic enableMultilib;

    inherit version targetPlatform hostPlatform buildPlatform langJava langGo crossStageStatic enableMultilib;

  };



  dontDisableStatic = true;