Skip to content

Commit

Permalink
Pass Boost.Context library to linker, given BOOST_ALL_NO_LIB
Browse files Browse the repository at this point in the history
  • Loading branch information
nat-goodspeed committed Nov 22, 2024
1 parent 7c8caaf commit e5a97c8
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions build-cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,11 @@ apply_patch()
git apply --directory="$path" "$patch"
}

# ----------------------------------------------------------------------------
# For exception test linking, skip this patch: we DO want to be able to link
# the correct libraries automatically.
if false; then
apply_patch "../patches/libs/config/0001-Define-BOOST_ALL_NO_LIB.patch" "libs/config"
if [[ $? -ne 0 ]]
then
nl -b a libs/config/include/boost/config/user.hpp
fi
fi
# ----------------------------------------------------------------------------
apply_patch "../patches/libs/fiber/0001-DRTVWR-476-Use-WIN32_LEAN_AND_MEAN-for-each-include-.patch" "libs/fiber"
if [[ $? -ne 0 ]]
then
Expand Down Expand Up @@ -365,6 +359,7 @@ fi # =========================================================================
if cl \
/DBOOST_USE_WINFIB \
/EHsc /I. /Fo"$(native "$testo")" /Fe"$(native "$testx")" "$(native "$test")" \
"$(native "${stage_release}/libboost_context-mt-x64.lib")" \
/link /libpath:"$(native "${stage_release}")"
then
"$testx"
Expand Down

0 comments on commit e5a97c8

Please sign in to comment.