Skip to content

Commit

Permalink
Merge pull request #118 from evoskuil/master
Browse files Browse the repository at this point in the history
Regenerate artifacts.
  • Loading branch information
evoskuil committed Nov 21, 2022
2 parents 34d4ec1 + 266a679 commit 0722a2b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ set_os_specific_compiler_settings()

link_to_standard_library()
{
if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
export LDLIBS="-l$STDLIB $LDLIBS"
export CXXFLAGS="-stdlib=lib$STDLIB $CXXFLAGS"
fi
Expand Down Expand Up @@ -728,7 +728,7 @@ initialize_boost_configuration()
BOOST_TOOLSET="toolset=$CC"
fi

if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
STDLIB_FLAG="-stdlib=lib$STDLIB"
BOOST_CXXFLAGS="cxxflags=$STDLIB_FLAG"
BOOST_LINKFLAGS="linkflags=$STDLIB_FLAG"
Expand Down
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ set_os_specific_compiler_settings()

link_to_standard_library()
{
if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
export LDLIBS="-l$STDLIB $LDLIBS"
export CXXFLAGS="-stdlib=lib$STDLIB $CXXFLAGS"
fi
Expand Down Expand Up @@ -608,7 +608,7 @@ initialize_boost_configuration()
BOOST_TOOLSET="toolset=$CC"
fi

if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
STDLIB_FLAG="-stdlib=lib$STDLIB"
BOOST_CXXFLAGS="cxxflags=$STDLIB_FLAG"
BOOST_LINKFLAGS="linkflags=$STDLIB_FLAG"
Expand Down

0 comments on commit 0722a2b

Please sign in to comment.