Commit 5a545ca9 authored by Sander van der Burg's avatar Sander van der Burg
Browse files

Fix stdenv-native by creating a bintools wrapper with similar settings

parent 72b27f25

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;

    };