Commit ff8359ab authored by Alyssa Ross's avatar Alyssa Ross
Browse files

boost: fix build for s390 

Boost seems to call both S390 and S390x "s390x".  At least that's how
Conan does it:

https://github.com/conan-io/conan-center-index/pull/8282
parent ba4b2978

pkgs/development/libraries/boost/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ let 
    "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}"

    "architecture=${if stdenv.hostPlatform.isMips64

                    then if lib.versionOlder version "1.78" then "mips1" else "mips"

                    else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x"

                    else if stdenv.hostPlatform.isS390 then "s390x"

                    else toString stdenv.hostPlatform.parsed.cpu.family}"

    # env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o"

    "binary-format=${if stdenv.hostPlatform.isMacho then "mach-o"