Makefile - Issue 29823575: Noissue - fix the switching to clang++/libc++

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Delta Between Two Patch Sets: Makefile

Issue 29823575: Noissue - fix the switching to clang++/libc++ (Closed) Base URL: https://github.com/adblockplus/libadblockplus@ca063256d589c9e950a5b14a16bc266e3b5072e8

Left Patch Set: Created July 5, 2018, 10:10 a.m.

Right Patch Set: Created July 5, 2018, 10:21 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py)	1 HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py)

2	2

3 ifndef HOST_OS	3 ifndef HOST_OS

4 raw_OS = $(shell uname -s)	4 raw_OS = $(shell uname -s)

5 ifeq (${raw_OS},Linux)	5 ifeq (${raw_OS},Linux)

6 HOST_OS=linux	6 HOST_OS=linux

7 TRAVIS_OS_NAME=linux	7 TRAVIS_OS_NAME=linux

8 CXX=clang++	8 ifeq ($(origin CXX),default)
	sergei 2018/07/05 10:29:34 let user to specify CXX either as a command line o let user to specify CXX either as a command line or as the environment variable.
	9 CXX=clang++

	10 endif

9 else ifeq (${raw_OS},Darwin)	11 else ifeq (${raw_OS},Darwin)

10 HOST_OS=mac	12 HOST_OS=mac

11 TRAVIS_OS_NAME=osx	13 TRAVIS_OS_NAME=osx

12 endif	14 endif

13 endif	15 endif

14	16

15 TARGET_OS ?= ${HOST_OS}	17 TARGET_OS ?= ${HOST_OS}

16 ABP_TARGET_ARCH ?= ${HOST_ARCH}	18 ABP_TARGET_ARCH ?= ${HOST_ARCH}

17 Configuration ?= debug	19 Configuration ?= debug

18	20

(...skipping 79 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
98 NDK_OUT=. \	100 NDK_OUT=. \

99 ${ANDROID_FIXES} \	101 ${ANDROID_FIXES} \

100 NDK_APP_DST_DIR=android-$(ABP_TARGET_ARCH).release	102 NDK_APP_DST_DIR=android-$(ABP_TARGET_ARCH).release

101 else	103 else

102 SUB_ACTION ?= all	104 SUB_ACTION ?= all

103 ifdef CXX	105 ifdef CXX

104 CXX_PARAM:=CXX=${CXX}	106 CXX_PARAM:=CXX=${CXX}

105 endif	107 endif

106 all: ensure_dependencies	108 all: ensure_dependencies

107 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp	109 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp

108 $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION} ${CXX_PARAM}	110 $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION} ${CXX_PARAM}
sergei 2018/07/05 10:29:34 It's not enough to define a local variable CXX, we It's not enough to define a local variable CXX, we should also pass it to $(MAKE), however if CXX is not defined, e.g. on another platform we should rather pass nothing. Therefore I have added CXX_PARAM which has CXX=${CXX} value when CXX is defined and is empty when CXX is not defined.
109	111

110 endif	112 endif

LEFT	RIGHT