diff options
| author | Mark Schofield <mschofie@microsoft.com> | 2020-04-24 14:03:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 14:03:45 -0700 |
| commit | 3ae3c41810b0c38a36623f3372fcb3dbac93c8ff (patch) | |
| tree | e290d46df9cf0220edfab76b5c15d748b0967042 | |
| parent | 7fbb19602a82dc25c370d1d87014fbe748002a4e (diff) | |
| download | vcpkg-3ae3c41810b0c38a36623f3372fcb3dbac93c8ff.tar.gz vcpkg-3ae3c41810b0c38a36623f3372fcb3dbac93c8ff.zip | |
[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>
| -rw-r--r-- | ports/boost-modular-build-helper/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/portfile.cmake | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 8c91184a4..23a0de50f 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -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}")
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 94ce34b89..b3a955924 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper
-Version: 1.72.0-1
+Version: 1.72.0-2
diff --git a/ports/boost-modular-build-helper/portfile.cmake b/ports/boost-modular-build-helper/portfile.cmake index 6ed367434..5f63ce5d8 100644 --- a/ports/boost-modular-build-helper/portfile.cmake +++ b/ports/boost-modular-build-helper/portfile.cmake @@ -9,4 +9,4 @@ file( ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
DESTINATION
${CURRENT_PACKAGES_DIR}/share/boost-build
-)
+)
\ No newline at end of file |