icu: build with gcc6 on i686

This commit is contained in:
Vladimír Čunát 2018-02-18 11:21:27 +01:00
parent 64db4f7a57
commit 9a2914a4f3
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -9126,8 +9126,14 @@ with pkgs;
hyena = callPackage ../development/libraries/hyena { };
icu58 = callPackage ../development/libraries/icu/58.nix { };
icu59 = callPackage ../development/libraries/icu/59.nix { };
icu58 = callPackage ../development/libraries/icu/58.nix
(stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
icu59 = callPackage ../development/libraries/icu/59.nix
(stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
icu = icu59;