Skip to content

Commit 07b1448

Browse files
authored
Merge pull request #3164 from martin-frbg/travisosxomp
Fix xcode12 build on Travis and add OSX/OpenMP job
2 parents 22db876 + 292a0ae commit 07b1448

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

.travis.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,21 @@ matrix:
224224
before_script:
225225
- COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
226226
- brew update
227-
- brew install gcc@10
228227
script:
229228
- travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
230229
env:
231-
- BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10"
232-
230+
- BTYPE="TARGET=HASWELL USE_OPENMP=1 BINARY=64 INTERFACE64=1 FC=gfortran-10"
231+
232+
- <<: *test-macos
233+
osx_image: xcode12
234+
before_script:
235+
- COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32"
236+
- brew update
237+
script:
238+
- travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE
239+
env:
240+
- BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10"
241+
233242
# - <<: *test-macos
234243
# osx_image: xcode10
235244
# env:

0 commit comments

Comments
 (0)