We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent d361cdf commit 007faafCopy full SHA for 007faaf
1 file changed
Makefile
@@ -5,7 +5,9 @@ ifndef HOST_OS
5
ifeq (${raw_OS},Linux)
6
HOST_OS=linux
7
TRAVIS_OS_NAME=linux
8
- CXX=clang++
+ ifeq ($(origin CXX),default)
9
+ CXX=clang++
10
+ endif
11
else ifeq (${raw_OS},Darwin)
12
HOST_OS=mac
13
TRAVIS_OS_NAME=osx
@@ -100,8 +102,11 @@ all: ensure_dependencies
100
102
NDK_APP_DST_DIR=android-$(ABP_TARGET_ARCH).release
101
103
else
104
SUB_ACTION ?= all
105
+ifdef CXX
106
+CXX_PARAM:=CXX=${CXX}
107
+endif
108
all: ensure_dependencies
109
GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp
- $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION}
110
+ $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION} ${CXX_PARAM}
111
112
endif
0 commit comments