summary refs log tree commit diff
path: root/pkgs/development/interpreters/spidermonkey
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-09-14 12:18:36 +0200
committerRobin Gloster <mail@glob.in>2019-09-14 12:19:27 +0200
commita345623f2b05ffcc0c07f9fde5d3348cc7e5ec82 (patch)
tree59f8a51e51781c3a27003473a121e16de828fb6a /pkgs/development/interpreters/spidermonkey
parenta5d5133e9c7ad37b161ecde4d96f6beb80a0d5f5 (diff)
downloadnixpkgs-a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82.tar
nixpkgs-a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82.tar.gz
nixpkgs-a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82.tar.bz2
nixpkgs-a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82.tar.lz
nixpkgs-a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82.tar.xz
nixpkgs-a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82.tar.zst
nixpkgs-a345623f2b05ffcc0c07f9fde5d3348cc7e5ec82.zip
spidermonkey_1_8_5: fix build with gcc8
closes #68765
closes #68763
Diffstat (limited to 'pkgs/development/interpreters/spidermonkey')
-rw-r--r--pkgs/development/interpreters/spidermonkey/1.8.5.nix6
1 files changed, 6 insertions, 0 deletions
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