talloc: move NIX_LDFLAGS into env for structuredAttrs (#486072)
This commit is contained in:
@@ -60,15 +60,18 @@ stdenv.mkDerivation rec {
|
||||
"--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
|
||||
];
|
||||
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
|
||||
# https://reviews.llvm.org/D135402
|
||||
NIX_LDFLAGS = lib.optional (
|
||||
stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
|
||||
) "--undefined-version";
|
||||
env = {
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
}
|
||||
//
|
||||
lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17")
|
||||
{
|
||||
# https://reviews.llvm.org/D135402
|
||||
NIX_LDFLAGS = "--undefined-version";
|
||||
};
|
||||
|
||||
# this must not be exported before the ConfigurePhase otherwise waf whines
|
||||
preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
|
||||
Reference in New Issue
Block a user