From 3ae3c41810b0c38a36623f3372fcb3dbac93c8ff Mon Sep 17 00:00:00 2001
From: Mark Schofield <mschofie@microsoft.com>
Date: Fri, 24 Apr 2020 14:03:45 -0700
Subject: [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>
---
 ports/boost-modular-build-helper/CMakeLists.txt | 6 +++++-
 ports/boost-modular-build-helper/CONTROL        | 2 +-
 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
-- 
cgit v1.2.3