Merge remote-tracking branch 'upstream/gcc8' into staging-next

This commit is contained in:
Frederik Rietdijk
2019-09-06 23:25:18 +02:00
9 changed files with 48 additions and 9 deletions

View File

@@ -373,6 +373,9 @@ stdenv.mkDerivation ({
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
# See #40038
broken = stdenv.isDarwin;
};
}

View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, bison, flex}:
{stdenv, fetchurl, fetchpatch, bison, flex}:
stdenv.mkDerivation rec {
pname = "iasl";
@@ -9,12 +9,20 @@ stdenv.mkDerivation rec {
sha256 = "1vgqlv9pvxc52faxixpgz7hi1awqmj88bw5vqn3bldf6fmkh147w";
};
NIX_CFLAGS_COMPILE = "-O3";
NIX_CFLAGS_COMPILE = [
"-O3"
];
buildFlags = "iasl";
buildInputs = [ bison flex ];
patches = fetchpatch {
/* https://github.com/acpica/acpica/pull/389 */
url = "https://github.com/acpica/acpica/commit/935ca65f7806a3ef9bd02a947e50f3a1f586ac67.patch";
sha256 = "0jz4bakifphm425shbd1j99hldgy71m7scl8mwibm441d56l3ydf";
};
installPhase =
''
install -d $out/bin

View File

@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
make golden && make test
'';
NIX_CFLAGS_COMPILE="-Wno-error=attributes";
meta = with stdenv.lib; {
homepage = https://www.nasm.us/;
description = "An 80x86 and x86-64 assembler designed for portability and modularity";