diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
| commit | 765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch) | |
| tree | c130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/development/compilers/openjdk/8.nix | |
| parent | 690a8017de9f9e9bed8609c1798d6d4309d9794a (diff) | |
| parent | cad8fc3447372043c4a098a3104a03f4990058e4 (diff) | |
| download | nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2 nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip | |
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/development/compilers/openjdk/8.nix')
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 948948ebc44e..e82f40fc089e 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -106,6 +106,12 @@ let # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + stdenv.lib.optionalString stdenv.cc.isGNU '' NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" + '' + # The configure script was confused by our passing these with full paths, + # so we explicitly override them to short variants. + + '' + CC=${stdenv.cc.targetPrefix}cc + CXX=${stdenv.cc.targetPrefix}c++ ''; configureFlags = [ |