[boost-modular-build-helper] Support Clang '--target=<value>' syntax to enable Android builds (#10285)

* [boost-modular-build-helper] Support Clang --target=<value> syntax to enable Android builds (#10091)

* [boost-modular-build-helper] Updating to version 1.72.0-2

* re-trigger ci test

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
Mark Schofield 2020-04-24 14:03:45 -07:00 committed by GitHub
parent 7fbb19602a
commit 3ae3c41810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions

View File

@ -83,7 +83,11 @@ endif()
#set(CXXFLAGS "${CXXFLAGS} <compileflags>-Wno-error=unused-command-line-argument")
if(CMAKE_CXX_COMPILER_TARGET)
set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <compileflags>${CMAKE_CXX_COMPILER_TARGET}")
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
else()
set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <compileflags>${CMAKE_CXX_COMPILER_TARGET}")
endif()
endif()
if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)
set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <compileflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")

View File

@ -1,2 +1,2 @@
Source: boost-modular-build-helper
Version: 1.72.0-1
Version: 1.72.0-2

View File

@ -9,4 +9,4 @@ file(
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
DESTINATION
${CURRENT_PACKAGES_DIR}/share/boost-build
)
)