Merge pull request #186 from jonchang/fix-macos-builds

Fix macOS builds
FePhyFoFum · Jun 20, 2024 · 5a2c845 · 5a2c845
2 parents a439b02 + 28c55c8
commit 5a2c845
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -24,15 +24,8 @@ jobs:
       run: |
           # install dependencies
           brew install nlopt armadillo automake autoconf
-          # append $PATH
-          # examine the path before
-          echo "PATH BEFORE:"
-          echo ${PATH}
-          # add to the $PATH
-          echo "/opt/homebrew/" >> $GITHUB_PATH
-          # examine the path after
-          echo "PATH AFTER:"
-          echo ${PATH}
+          echo "LDFLAGS=-L$(brew --prefix)/lib" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$(brew --prefix)/include" >> $GITHUB_ENV
     - name: Install apt dependencies
       if: runner.os == 'Linux'
       run: |

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -361,10 +361,10 @@ RATE_DEPS += \
 #./state_reconstructor_simple.d \
 
 main_%.o: ./main_%.cpp
-	$(CXX) $(CXXFLAGS) $(OPT_FLAGS) $(CPPFLAGS) $(LDFLAGS) -c -fmessage-length=0 -MMD -MP -MF "$(@:%.o=%.d)" -o "$@" "$<"
+	$(CXX) $(CXXFLAGS) $(OPT_FLAGS) $(CPPFLAGS) -c -fmessage-length=0 -MMD -MP -MF "$(@:%.o=%.d)" -o "$@" "$<"
 
 %.o: ./%.cpp ./%.h
-	$(CXX) $(CXXFLAGS) $(OPT_FLAGS) $(CPPFLAGS) $(LDFLAGS) -c -fmessage-length=0 -MMD -MP -MF "$(@:%.o=%.d)" -o "$@" "$<"
+	$(CXX) $(CXXFLAGS) $(OPT_FLAGS) $(CPPFLAGS) -c -fmessage-length=0 -MMD -MP -MF "$(@:%.o=%.d)" -o "$@" "$<"
 
 PROGS := pxaa2cdn pxbdsim pxboot pxbp pxcat pxclsq pxcltr pxcolt pxcomp pxconsq pxfqfilt pxlog pxlssq pxlstr pxmono pxmrca pxmrcacut pxmrcaname pxnw pxpoly pxrecode pxrevcomp pxrls pxrlt pxrmk pxrms pxrmt pxrr pxs2fa pxs2nex pxs2phy pxseqgen pxssort pxsstat pxsw pxt2new pxt2nex pxtcol pxtcomb pxtgen pxtlate pxtrt pxtscale pxvcf2fa $(NLOPT_PROGRAMS)