* Spidermonkey doesn't compile with gcc 4.1.1 (ICE), so use 3.4
instead. svn path=/nixpkgs/trunk/; revision=5495
This commit is contained in:
parent
423af3206e
commit
c1103ad849
@ -1,4 +1,4 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl, gcc}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "spidermonkey-1.5";
|
name = "spidermonkey-1.5";
|
||||||
@ -8,4 +8,6 @@ stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
|
NIX_GCC = gcc; # remove when the "internal compiler error" in gcc 4.1.x is fixed
|
||||||
}
|
}
|
||||||
|
@ -885,6 +885,7 @@ rec {
|
|||||||
|
|
||||||
spidermonkey = (import ../development/interpreters/spidermonkey) {
|
spidermonkey = (import ../development/interpreters/spidermonkey) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
|
gcc = gcc34;
|
||||||
};
|
};
|
||||||
|
|
||||||
lua4 = (import ../development/interpreters/lua-4) {
|
lua4 = (import ../development/interpreters/lua-4) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user