File tree Expand file tree Collapse file tree 2 files changed +22
-15
lines changed
Expand file tree Collapse file tree 2 files changed +22
-15
lines changed Original file line number Diff line number Diff line change 11#! /usr/bin/env bash
2- set -Eeuxo pipefail
2+ # set -Eeuxo pipefail
33
44# if [[ "$(uname)" == "Linux" ]]; then
55# sudo update-alternatives \
@@ -20,14 +20,17 @@ set -Eeuxo pipefail
2020# fi
2121
2222if [[ " $( uname) " == " Darwin" ]]; then
23- set -Eeuxo pipefail
24- sudo ln -s /usr/local/bin/gcc-$1 /usr/local/bin/gcc
25- sudo ln -s /usr/local/bin/g++-$1 /usr/local/bin/g++
26- sudo ln -s /usr/local/bin/cpp-$1 /usr/local/bin/cpp
23+ BIN_ROOT_DIR=" /usr/local/bin"
24+ which gcc-$1
25+ which gcc
26+ sudo ln -s $( which gcc-$1 ) " ${BIN_ROOT_DIR} /gcc"
27+ which gcc
28+ sudo ln -s $( which g++-$1 ) " ${BIN_ROOT_DIR} /g++"
29+ sudo ln -s $( which cpp-$1 ) " ${BIN_ROOT_DIR} /cpp"
2730 # sudo ln -s /usr/local/bin/gfortran-$1 /usr/local/bin/gfortran # already exists
28- sudo ln -s /usr/local/bin/ gcc-ar-$1 /usr/local/bin/ gcc-ar
29- sudo ln -s /usr/local/bin/ gcc-nm-$1 /usr/local/bin/ gcc-nm
30- sudo ln -s /usr/local/bin/ gcc-ranlib-$1 /usr/local/bin/ gcc-ranlib
31- sudo ln -s /usr/local/bin/ gcov-$1 /usr/local/bin/ gcov
32- sudo ln -s /usr/local/bin/ gcov-dump-$1 /usr/local/bin/ gcov-dump
31+ sudo ln -s $( which gcc-ar-$1 ) " ${BIN_ROOT_DIR} / gcc-ar"
32+ sudo ln -s $( which gcc-nm-$1 ) " ${BIN_ROOT_DIR} / gcc-nm"
33+ sudo ln -s $( which gcc-ranlib-$1 ) " ${BIN_ROOT_DIR} / gcc-ranlib"
34+ sudo ln -s $( which gcov-$1 ) " ${BIN_ROOT_DIR} / gcov"
35+ sudo ln -s $( which gcov-dump-$1 ) " ${BIN_ROOT_DIR} / gcov-dump"
3336fi
Original file line number Diff line number Diff line change @@ -32,24 +32,26 @@ matrix:
3232 language : python
3333 python : " 3.8"
3434 - os : osx
35- osx_image : xcode11
35+ osx_image : xcode11.2
3636 language : generic
3737 env : TRAVIS_PYTHON_VERSION="3.5"
3838 - os : osx
39- osx_image : xcode11
39+ osx_image : xcode11.2
4040 language : generic
4141 env : TRAVIS_PYTHON_VERSION="3.6"
4242 - os : osx
43- osx_image : xcode11
43+ osx_image : xcode11.2
4444 language : generic
4545 env : TRAVIS_PYTHON_VERSION="3.7"
4646 - os : osx
47- osx_image : xcode11
47+ osx_image : xcode11.2
4848 language : generic
4949 env : TRAVIS_PYTHON_VERSION="3.8"
5050
5151before_install :
52- - .build/choose_gcc.sh 8
52+ - echo "${PATH}"
53+ - which gcc
54+ - .build/choose_gcc.sh 9
5355 - |
5456 set -e
5557 if [[ "$(uname)" == "Darwin" ]]; then
@@ -64,11 +66,13 @@ before_install:
6466 brew doctor 2>&1 | grep "/usr/local/include" | awk '{$1=$1;print}' | xargs -I _ mv _ /tmp/includes
6567 fi
6668 set +e
69+ - which gcc
6770 - gcc --version
6871 - g++ --version
6972 - swig -version
7073 - gfortran --version
7174 - java --version
75+ - qwertyuiop
7276 - .build/install_pyenv.sh
7377 # apps
7478 - git clone "https://github.com/mbdevpl/ffb-mini" "../ffb-mini"
You can’t perform that action at this time.
0 commit comments