Skip to content

GitLab

Unverified Commit c8a79690 authored by Matti Picus's avatar Matti Picus Committed by GitHub
Browse files

Merge pull request #515 from matthew-brett/deduplicate-archflags 

Only add wrapped archflags if not already present.
parents 452dd2d1 a6605220
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
osx_utils.sh
View file @ c8a79690
...@@ -466,7 +466,7 @@ function macos_intel_native_build_setup { ...@@ -466,7 +466,7 @@ function macos_intel_native_build_setup {
export _PYTHON_HOST_PLATFORM="macosx-${MB_PYTHON_OSX_VER}-x86_64" export _PYTHON_HOST_PLATFORM="macosx-${MB_PYTHON_OSX_VER}-x86_64"
export CFLAGS+=" -arch x86_64" export CFLAGS+=" -arch x86_64"
export CXXFLAGS+=" -arch x86_64" export CXXFLAGS+=" -arch x86_64"
export ARCHFLAGS+=" -arch x86_64" [[ $ARCHFLAGS =~ "-arch x86_64" ]] || export ARCHFLAGS+=" -arch x86_64"
export CPPFLAGS+=" -arch x86_64" export CPPFLAGS+=" -arch x86_64"
export LDFLAGS+=" -arch x86_64" export LDFLAGS+=" -arch x86_64"
} }
...@@ -487,7 +487,7 @@ function macos_arm64_cross_build_setup { ...@@ -487,7 +487,7 @@ function macos_arm64_cross_build_setup {
export CFLAGS+=" -arch arm64" export CFLAGS+=" -arch arm64"
export CXXFLAGS+=" -arch arm64" export CXXFLAGS+=" -arch arm64"
export CPPFLAGS+=" -arch arm64" export CPPFLAGS+=" -arch arm64"
export ARCHFLAGS+=" -arch arm64" [[ $ARCHFLAGS =~ "-arch arm64" ]] || export ARCHFLAGS+=" -arch arm64"
export FCFLAGS+=" -arch arm64" export FCFLAGS+=" -arch arm64"
export FC=$FC_ARM64 export FC=$FC_ARM64
export F90=${F90_ARM64:-${FC}} export F90=${F90_ARM64:-${FC}}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment