diff options
| author | Greg Price <gnprice@gmail.com> | 2020-03-29 15:32:53 -0700 |
|---|---|---|
| committer | Greg Price <gnprice@gmail.com> | 2020-03-30 22:56:48 -0700 |
| commit | 9d8831c8fe31ce26777274af68054c55342f48dc (patch) | |
| tree | 0153f60d65f242eeca9e3c0ce57fff6b5e7ad0c9 /pkgs | |
| parent | 1992768157d7456748ec28e01c8952cf09b53fbf (diff) | |
| download | nixlib-9d8831c8fe31ce26777274af68054c55342f48dc.tar nixlib-9d8831c8fe31ce26777274af68054c55342f48dc.tar.gz nixlib-9d8831c8fe31ce26777274af68054c55342f48dc.tar.bz2 nixlib-9d8831c8fe31ce26777274af68054c55342f48dc.tar.lz nixlib-9d8831c8fe31ce26777274af68054c55342f48dc.tar.xz nixlib-9d8831c8fe31ce26777274af68054c55342f48dc.tar.zst nixlib-9d8831c8fe31ce26777274af68054c55342f48dc.zip | |
cpython: Drop unrecognized --with-threads configure flag.
The ./configure script prints a warning when passed this flag, starting with 3.7: configure: WARNING: unrecognized options: --with-threads The reason is that there's no longer such a thing as a build without threads. Eliminate the warning, by only passing the flag on the older releases that accept it. Upstream change and discussion: https://github.com/python/cpython/commit/a6a4dc816 https://bugs.python.org/issue31370
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b778b62f908d..1df70fb99ccb 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -136,10 +136,12 @@ in with passthru; stdenv.mkDerivation { configureFlags = [ "--enable-shared" - "--with-threads" "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (pythonOlder "3.7") [ + # This is unconditionally true starting in CPython 3.7. + "--with-threads" ] ++ optionals (sqlite != null && isPy3k) [ "--enable-loadable-sqlite-extensions" ] ++ optionals (openssl != null) [ |