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

Unified Diff: Makefile

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

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

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Makefile

diff --git a/Makefile b/Makefile

index 399c64d599d7230c40f2479585cd164228d02cf1..c2adc64e5841c615192472d4820f5675c387b205 100644

--- a/Makefile

+++ b/Makefile

@@ -5,7 +5,9 @@ ifndef HOST_OS

ifeq (${raw_OS},Linux)

HOST_OS=linux

TRAVIS_OS_NAME=linux

- CXX=clang++

+ ifeq ($(origin CXX),default)

sergei 2018/07/05 10:29:34 let user to specify CXX either as a command line o

+ CXX=clang++

+ endif

else ifeq (${raw_OS},Darwin)

HOST_OS=mac

TRAVIS_OS_NAME=osx

@@ -100,8 +102,11 @@ all: ensure_dependencies

NDK_APP_DST_DIR=android-$(ABP_TARGET_ARCH).release

else

SUB_ACTION ?= all

+ifdef CXX

+CXX_PARAM:=CXX=${CXX}

+endif

all: ensure_dependencies

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}

+ $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION} ${CXX_PARAM}

endif

« no previous file with comments | « no previous file | no next file » | no next file with comments »