Skip to content

Commit

Permalink
Defaults to C++20 for MacOS builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
johnoel committed Jan 30, 2024
1 parent 6e0af9c commit b7e7784
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/admb/admb
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ else
fi
fi
if [ "`uname`" == "Darwin" ]; then
CXXFLAGS="-std=c++17 $CXXFLAGS"
LDFLAGS="-std=c++17 $LDFLAGS"
CXXFLAGS="-std=c++20 $CXXFLAGS"
LDFLAGS="-std=c++20 $LDFLAGS"
elif [[ "$CXX" =~ "clang++" ]]; then
CXXFLAGS="-std=c++17 $CXXFLAGS"
LDFLAGS="-std=c++17 $LDFLAGS"
Expand Down
2 changes: 1 addition & 1 deletion src/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ ifeq ($(CMDSHELL),cmd)
endif
else
ifeq ("$(UNAME_S)","Darwin")
ADCXXFLAGS:= -std=c++17 $(ADCXXFLAGS)
ADCXXFLAGS:= -std=c++20 $(ADCXXFLAGS)
else
ifeq ($(findstring clang++,$(CXX)),clang++)
ADCXXFLAGS:= -std=c++17 $(ADCXXFLAGS)
Expand Down

0 comments on commit b7e7784

Please sign in to comment.