From a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 14 Sep 2019 12:18:36 +0200 Subject: [PATCH] spidermonkey_1_8_5: fix build with gcc8 closes #68765 closes #68763 --- pkgs/development/interpreters/spidermonkey/1.8.5.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 8f9477c4c4a..97d2b67372a 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -37,6 +37,12 @@ stdenv.mkDerivation { patchFlags = "-p3"; + # fixes build on gcc8 + postPatch = '' + substituteInPlace ./methodjit/MethodJIT.cpp \ + --replace 'asm volatile' 'asm' + ''; + # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in # "make check". Disabling tracejit makes it work, but then it needs the # patch findvanilla.patch do disable a checker about allocator safety. In case