gcc12: fix build with libxcrypt
This commit is contained in:
parent
aac6de8d31
commit
21c552eaf6
|
@ -26,6 +26,7 @@
|
||||||
, gnused ? null
|
, gnused ? null
|
||||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||||
, buildPackages
|
, buildPackages
|
||||||
|
, libxcrypt
|
||||||
}:
|
}:
|
||||||
|
|
||||||
# Make sure we get GNU sed.
|
# Make sure we get GNU sed.
|
||||||
|
@ -173,7 +174,7 @@ stdenv.mkDerivation ({
|
||||||
++ optional targetPlatform.isLinux patchelf;
|
++ optional targetPlatform.isLinux patchelf;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gmp mpfr libmpc
|
gmp mpfr libmpc libxcrypt
|
||||||
targetPackages.stdenv.cc.bintools # For linking code at run-time
|
targetPackages.stdenv.cc.bintools # For linking code at run-time
|
||||||
] ++ (optional (isl != null) isl)
|
] ++ (optional (isl != null) isl)
|
||||||
++ (optional (zlib != null) zlib)
|
++ (optional (zlib != null) zlib)
|
||||||
|
@ -183,10 +184,13 @@ stdenv.mkDerivation ({
|
||||||
|
|
||||||
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
|
NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl";
|
||||||
|
|
||||||
preConfigure = import ../common/pre-configure.nix {
|
|
||||||
|
preConfigure = (import ../common/pre-configure.nix {
|
||||||
inherit lib;
|
inherit lib;
|
||||||
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;
|
inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic enableMultilib;
|
||||||
};
|
}) + ''
|
||||||
|
ln -sf ${libxcrypt}/include/crypt.h libsanitizer/sanitizer_common/crypt.h
|
||||||
|
'';
|
||||||
|
|
||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue