diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-17 08:43:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-17 08:43:04 +0100 |
| commit | 88089559b9b3e028ec7745ac593610550d9b2668 (patch) | |
| tree | c4470e0ff710fd5a007eb29adf77f6e8c64620ef /pkgs/development/interpreters | |
| parent | 1575bc652eeee758816d63efccd1ab6eca16d2c9 (diff) | |
| parent | f326b7995c6615e27e75b05dd3c2edff5b61d3b3 (diff) | |
| download | nixlib-88089559b9b3e028ec7745ac593610550d9b2668.tar nixlib-88089559b9b3e028ec7745ac593610550d9b2668.tar.gz nixlib-88089559b9b3e028ec7745ac593610550d9b2668.tar.bz2 nixlib-88089559b9b3e028ec7745ac593610550d9b2668.tar.lz nixlib-88089559b9b3e028ec7745ac593610550d9b2668.tar.xz nixlib-88089559b9b3e028ec7745ac593610550d9b2668.tar.zst nixlib-88089559b9b3e028ec7745ac593610550d9b2668.zip | |
Merge #5676: gcc-wrapper -> cc-wrapper and related
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/dart/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.4/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch | 19 |
3 files changed, 24 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index f51ac1cdddf1..dd0d0e94482c 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6"; }; - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; dontStrip = true; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index c5d86766d1f0..8a6f2b61bb09 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -27,9 +27,11 @@ let C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") + LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs)); + patches = [ ./fix-gcc-4-9-2.patch ]; + preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ diff --git a/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch b/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch new file mode 100644 index 000000000000..dc01c5795dd1 --- /dev/null +++ b/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch @@ -0,0 +1,19 @@ +--- a/rpython/translator/c/gcc/trackgcroot.py ++++ b/rpython/translator/c/gcc/trackgcroot.py +@@ -590,7 +590,7 @@ + + # The various cmov* operations + for name in ''' +- e ne g ge l le a ae b be p np s ns o no ++ e ne g ge l le a ae b be nb p np s ns o no + '''.split(): + locals()['visit_cmov' + name] = binary_insn + locals()['visit_cmov' + name + 'l'] = binary_insn +@@ -837,6 +837,7 @@ + visit_jb = conditional_jump + visit_jbe = conditional_jump + visit_jp = conditional_jump ++ visit_jnb = conditional_jump + visit_jnp = conditional_jump + visit_js = conditional_jump + visit_jns = conditional_jump |