diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-01-14 12:43:54 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2020-01-31 21:52:13 +0100 |
| commit | 68513e40711cd942144a1da9c9e434b378c2c762 (patch) | |
| tree | 6b22b95196617d7cbdaf2684769ba9fca1a1be8e /pkgs/development/tools/build-managers | |
| parent | b984c227d28c0af7b1afaace0c2ad107d94757f6 (diff) | |
| download | nixlib-68513e40711cd942144a1da9c9e434b378c2c762.tar nixlib-68513e40711cd942144a1da9c9e434b378c2c762.tar.gz nixlib-68513e40711cd942144a1da9c9e434b378c2c762.tar.bz2 nixlib-68513e40711cd942144a1da9c9e434b378c2c762.tar.lz nixlib-68513e40711cd942144a1da9c9e434b378c2c762.tar.xz nixlib-68513e40711cd942144a1da9c9e434b378c2c762.tar.zst nixlib-68513e40711cd942144a1da9c9e434b378c2c762.zip | |
cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv
This was initially introduced in 92188d9d1751892ddbf8913da73dfc150d18fadb, not clear how relevant this still is but i686 isn't supported anymore so disable it explicitly.
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 5479067d637e..87bbefa6bbfa 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -50,6 +50,9 @@ cmakeConfigurePhase() { # because we usually do not package the framework cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags" + # on macOS i686 was only relevant for 10.5 or earlier. + cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags" + # we never want to use the global macOS SDK cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags" |