Unverified Commit 204b73ff authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #38932 from svanderburg/cygwin-fixes 

Fix stdenv-native and fix rebasing on cygwin
parents 76a43d76 a7adffdd

pkgs/stdenv/cygwin/rebase-x86_64.sh

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ _cygwinFixAutoImageBase() { 
        if [ -f /etc/rebasenix.nextbase ]; then

            NEXTBASE="$(</etc/rebasenix.nextbase)"

        fi

        NEXTBASE=${NEXTBASE:-0x200000000}

        NEXTBASE=${NEXTBASE:-0x200000001}



        REBASE=(`/bin/rebase -i $DLL`)

        BASE=${REBASE[2]}

pkgs/stdenv/native/default.nix

+13 −4
Original line number Diff line number Diff line
@@ -119,14 +119,23 @@ in 
    };

    stdenvNoCC = stdenv;



    cc = import ../../build-support/cc-wrapper {

      name = "cc-native";

      nativeTools = true;

      nativeLibc = true;

    cc = let

      nativePrefix = { # switch

        "i686-solaris" = "/usr/gnu";

        "x86_64-solaris" = "/opt/local/gcc47";

      }.${system} or "/usr";

    in

    import ../../build-support/cc-wrapper {

      name = "cc-native";

      nativeTools = true;

      nativeLibc = true;

      inherit nativePrefix;

      bintools = import ../../build-support/bintools-wrapper {

        name = "bintools";

        inherit stdenvNoCC nativePrefix;

        nativeTools = true;

        nativeLibc = true;

      };

      inherit stdenvNoCC;

    };