Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix macOS builds #186

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Fix macOS builds #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2953111
Set build flags for macOS
jonchang Jun 20, 2024
28c55c8
Don't set linker flags on build, only on link
jonchang Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down