Merge commit 'b53902f535f2c63d71e916b9de22dbcfeec9d99e' into staging

This commit is contained in:
Matthew Bauer
2020-07-29 18:24:08 -05:00
4 changed files with 3 additions and 5 deletions
@@ -48,7 +48,7 @@ cmakeConfigurePhase() {
# on macOS we want to prefer Unix-style headers to Frameworks
# because we usually do not package the framework
cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags"
cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags"
# on macOS i686 was only relevant for 10.5 or earlier.
cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags"