diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-07-14 22:05:06 -0500 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-15 09:37:43 +0200 |
| commit | 7094a1af0c528b7c519a38253e5a4fab7dcf056e (patch) | |
| tree | 3189d610d3c0233af8eb423a9376f524f0d50ae4 /pkgs/development | |
| parent | 54065ae20d6c91cab54aa706d6e819baf673b80c (diff) | |
| download | nixpkgs-7094a1af0c528b7c519a38253e5a4fab7dcf056e.tar nixpkgs-7094a1af0c528b7c519a38253e5a4fab7dcf056e.tar.gz nixpkgs-7094a1af0c528b7c519a38253e5a4fab7dcf056e.tar.bz2 nixpkgs-7094a1af0c528b7c519a38253e5a4fab7dcf056e.tar.lz nixpkgs-7094a1af0c528b7c519a38253e5a4fab7dcf056e.tar.xz nixpkgs-7094a1af0c528b7c519a38253e5a4fab7dcf056e.tar.zst nixpkgs-7094a1af0c528b7c519a38253e5a4fab7dcf056e.zip | |
python37: fix distutils C++ patch (PR #64758)
Update distutils patch to the upstream changes. See: https://github.com/python/cpython/commit/6c0e0d141a07cc3fd2441d9df8d762f56bf7edf2
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch index ceb6047d31d..243313f7654 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch +++ b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch @@ -83,8 +83,8 @@ _osx_support.customize_compiler(_config_vars) _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' -- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', - 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') + (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ + get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', @@ -108,7 +108,7 @@ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] + ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] +- cflags = cflags + ' ' + os.environ['CFLAGS'] + cflags = os.environ['CFLAGS'] ldshared = ldshared + ' ' + os.environ['CFLAGS'] + if 'CXXFLAGS' in os.environ: |