handle gcc versions with brew

nwchemgit · Oct 8, 2024 · 8beba17 · 8beba17
1 parent ad4e8b5
commit 8beba17
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/travis/nwchem.bashrc b/travis/nwchem.bashrc
@@ -70,6 +70,19 @@ if [[ "$FC" == "ifort" ]] || [[ "$FC" == "ifx" ]] ; then
 #force icc on macos to cross-compile x86 on arm64
 # icx not available on macos
     if [[ "$os" == "Darwin" ]]; then
+     if [[ "$FC" != "gfortran" ]] && [[ "$FC" == "gfortran*" ]]; then
+	 mygccver=$(echo "$FC"|cut -d - -f 2)
+	 export PATH=$HOMEBREW_CELLAR/../opt/gcc@"$mygccver"/bin:$PATH
+	 echo gfortran is $(gfortran -v)
+	 echo gfortran-"$mygccver" is $(gfortran-"$mygccver" -v)
+     fi
+     if [[ "$FC" != "gcc" ]] && [[ "$FC" == "gcc*" ]]; then
+	 mygccver=$(echo "$CC"|cut -d - -f 2)
+	 HOMEBREW_NO_INSTALL_CLEANUP=1  HOMEBREW_NO_AUTO_UPDATE=1 brew reinstall gcc@"$mygccver" || true
+	 export PATH=$HOMEBREW_CELLAR/../opt/gcc@"$mygccver"/bin:$PATH
+	 echo gcc is $(gcc -v)
+	 echo gcc-"$mygccver" is $(gcc-"$mygccver" -v)
+     fi
 #	CC=icc
 #	CXX=icc
 # Intel MPI not available on macos       
@@ -94,19 +107,6 @@ fi
 if [[ "$os" == "Darwin" ]]; then 
   export NWCHEM_TARGET=MACX64 
   export DYLD_FALLBACK_LIBRARY_PATH=$TRAVIS_BUILD_DIR/lib:$DYLD_FALLBACK_LIBRARY_PATH 
-     if [[ "$FC" != "gfortran" ]] && [[ "$FC" == "gfortran*" ]]; then
-	 mygccver=$(echo "$FC"|cut -d - -f 2)
-	 export PATH=$HOMEBREW_CELLAR/../opt/gcc@"$mygccver"/bin:$PATH
-	 echo gfortran is $(gfortran -v)
-	 echo gfortran-"$mygccver" is $(gfortran-"$mygccver" -v)
-     fi
-     if [[ "$FC" != "gcc" ]] && [[ "$FC" == "gcc*" ]]; then
-	 mygccver=$(echo "$CC"|cut -d - -f 2)
-	 HOMEBREW_NO_INSTALL_CLEANUP=1  HOMEBREW_NO_AUTO_UPDATE=1 brew reinstall gcc@"$mygccver" || true
-	 export PATH=$HOMEBREW_CELLAR/../opt/gcc@"$mygccver"/bin:$PATH
-	 echo gcc is $(gcc -v)
-	 echo gcc-"$mygccver" is $(gcc-"$mygccver" -v)
-     fi
   if [[ "$MPI_IMPL" == "openmpi" ]]; then
     export PATH=/usr/local/opt/open-mpi/bin/:$PATH 
   fi