Merge pull request #16 from debbiemarkslab/fix/12/compilation

Remove need to link libomp with homebrew
debbiemarkslab · Jan 14, 2023 · 905011f · 905011f
2 parents 2d6e482 + 7c4ecdf
commit 905011f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,10 +33,13 @@ jobs:
           submodules: 'recursive'
 
       - name: Install prerequisites
+        env:
+          HOMEBREW_NO_AUTO_UPDATE: 1
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
         run: |
           case ${{ matrix.job.target }} in
             *-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install libomp-dev ;;
-            *-apple-darwin) brew update --preinstall ; env HOMEBREW_NO_AUTO_UPDATE=1 brew install gcc libomp; brew link libomp --force ;;
+            *-apple-darwin) brew install gcc libomp; ;;
           esac
 
       - name: Compile default

diff --git a/makefile b/makefile
@@ -28,9 +28,9 @@ all-mac32:
 	clang $(SOURCES) -o bin/plmc $(CLANGFLAGS) -D USE_FLOAT
 
 # If using homebrew for openMP (libomp)
-all-mac-openmp: BREW_PREFIX=$(shell brew --prefix)
+all-mac-openmp: LIBOMP_PREFIX=$(shell brew --prefix libomp)
 all-mac-openmp:
-	$(CC) $(SOURCES) -o bin/plmc -Xpreprocessor -fopenmp $(GCCFLAGS) -lomp -L$(BREW_PREFIX)/lib/ -I$(BREW_PREFIX)/include/
+	$(CC) $(SOURCES) -o bin/plmc -Xpreprocessor -fopenmp $(GCCFLAGS) -lomp -L$(LIBOMP_PREFIX)/lib/ -I$(LIBOMP_PREFIX)/include/
 
 clean:
 	rm -rf bin/*