summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2021-07-16 10:35:56 +0200
committerVladimír Čunát <v@cunat.cz>2021-07-16 10:35:56 +0200
commit1e9175815bff54995d71136a5b330196b987ea72 (patch)
tree9f2928384c8ec93228134ddf678dbc8454a6c410
parent3b437b95dfd1ce5dc6d471975df849c4c1e5b34b (diff)
parent1f2b1f3bb03674fd181444848452c32407afab5b (diff)
downloadnixpkgs-1e9175815bff54995d71136a5b330196b987ea72.tar
nixpkgs-1e9175815bff54995d71136a5b330196b987ea72.tar.gz
nixpkgs-1e9175815bff54995d71136a5b330196b987ea72.tar.bz2
nixpkgs-1e9175815bff54995d71136a5b330196b987ea72.tar.lz
nixpkgs-1e9175815bff54995d71136a5b330196b987ea72.tar.xz
nixpkgs-1e9175815bff54995d71136a5b330196b987ea72.tar.zst
nixpkgs-1e9175815bff54995d71136a5b330196b987ea72.zip
Merge #129669: cpython: disable features on darwin
... to fix the build (merging into staging-next)
-rw-r--r--pkgs/development/interpreters/python/cpython/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 842d132fd44..f52255f4748 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -40,10 +40,12 @@
 , static ? stdenv.hostPlatform.isStatic
 , enableOptimizations ? false
 # enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility.
-, enableNoSemanticInterposition ? true
+# clang starts supporting `-fno-sematic-interposition` with version 10
+, enableNoSemanticInterposition ? (!stdenv.cc.isClang || (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "10"))
 # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility.
 # enabling LTO on 32bit arch causes downstream packages to fail when linking
-, enableLTO ? stdenv.is64bit
+# enabling LTO on *-darwin causes python3 to fail when linking.
+, enableLTO ? stdenv.is64bit && stdenv.isLinux
 , reproducibleBuild ? true
 , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
 }: