Skip to content

Commit 007faaf

Browse files
committed
Noissue - fix the switching to clang++/libc++
1 parent d361cdf commit 007faaf

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ ifndef HOST_OS
55
ifeq (${raw_OS},Linux)
66
HOST_OS=linux
77
TRAVIS_OS_NAME=linux
8-
CXX=clang++
8+
ifeq ($(origin CXX),default)
9+
CXX=clang++
10+
endif
911
else ifeq (${raw_OS},Darwin)
1012
HOST_OS=mac
1113
TRAVIS_OS_NAME=osx
@@ -100,8 +102,11 @@ all: ensure_dependencies
100102
NDK_APP_DST_DIR=android-$(ABP_TARGET_ARCH).release
101103
else
102104
SUB_ACTION ?= all
105+
ifdef CXX
106+
CXX_PARAM:=CXX=${CXX}
107+
endif
103108
all: ensure_dependencies
104109
GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp
105-
$(MAKE) -C ${BUILD_DIR} ${SUB_ACTION}
110+
$(MAKE) -C ${BUILD_DIR} ${SUB_ACTION} ${CXX_PARAM}
106111

107112
endif

0 commit comments

Comments
 (0)