diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-02-10 19:22:15 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-02-10 19:22:15 +0100 |
| commit | e94a7366e71626ad3710ab3b498edfb9f832b99e (patch) | |
| tree | 3831d7fc3c3e0b277f1a39c6fe35b7f0d8c1d15e | |
| parent | 09f7e376c224993e82828766bf524f0b34ad312e (diff) | |
| parent | c2038483fda492591c2c08d07cdc1d8f59aaffd9 (diff) | |
| download | nixlib-e94a7366e71626ad3710ab3b498edfb9f832b99e.tar nixlib-e94a7366e71626ad3710ab3b498edfb9f832b99e.tar.gz nixlib-e94a7366e71626ad3710ab3b498edfb9f832b99e.tar.bz2 nixlib-e94a7366e71626ad3710ab3b498edfb9f832b99e.tar.lz nixlib-e94a7366e71626ad3710ab3b498edfb9f832b99e.tar.xz nixlib-e94a7366e71626ad3710ab3b498edfb9f832b99e.tar.zst nixlib-e94a7366e71626ad3710ab3b498edfb9f832b99e.zip | |
Merge #79738: glibc, openssl: unbreak cross eval
(with minor caveats)
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 9ea943816596..7ccba0072e28 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -111,6 +111,10 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + '' + # FIXME: find a solution for infinite recursion in cross builds. + # For now it's hopefully acceptable that IDN from libc doesn't reliably work. + + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Ensure that libidn2 is found. patch -p 1 <<EOF diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 63657cfc5e6e..9986c2217f7c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -36,7 +36,9 @@ let outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; - separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; + separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) + && stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc + && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodev; |