Skip to content

Commit e209f90

Browse files
Fix Boost bootstrap during cross compile. (#753)
Let the bootstrap figure out the toolset it needs. Relates-To: OLPEDGE-1661 Signed-off-by: Mykhailo Kuchma <[email protected]>
1 parent 4d49b18 commit e209f90

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

external/boost/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@
2121
if (WIN32)
2222
set(BOOTSTRAP_CMD bootstrap.bat)
2323
set(B2_CMD b2.exe)
24-
elseif (APPLE)
25-
# Reset the CXX (path to compiler) before running bootstrap.
24+
else()
25+
# Reset the CXX (path to compiler) before running bootstrap since we can cross compile.
2626
# Else we need to specify the -sysroot argument with CXXFLAGS.
2727
set(BOOTSTRAP_CMD unset CXX && ./bootstrap.sh)
2828
set(B2_CMD ./b2)
29-
else()
30-
set(BOOTSTRAP_CMD ./bootstrap.sh)
31-
set(B2_CMD ./b2)
3229
endif()
3330

3431
configure_file(CMakeLists.txt.boost.in download/CMakeLists.txt @ONLY)

0 commit comments

Comments
 (0)