Makefile - Issue 29817566: Noissue - Use clang++ and libc++ on Linux

Side by Side Diff

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

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

Side by Side Diff: Makefile

Issue 29817566: Noissue - Use clang++ and libc++ on Linux (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/

Patch Set: Fix Travis dependencies. Created July 4, 2018, 7:48 a.m.

Left:
Right:

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

Jump to:

OLD	NEW
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 else ifeq (${raw_OS},Darwin)	9 else ifeq (${raw_OS},Darwin)

9 HOST_OS=mac	10 HOST_OS=mac

10 TRAVIS_OS_NAME=osx	11 TRAVIS_OS_NAME=osx

11 endif	12 endif

12 endif	13 endif

13	14

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

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

16 Configuration ?= debug	17 Configuration ?= debug

17	18

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

98 ${ANDROID_FIXES} \	99 ${ANDROID_FIXES} \

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

100 else	101 else

101 SUB_ACTION ?= all	102 SUB_ACTION ?= all

102 all: ensure_dependencies	103 all: ensure_dependencies

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

104 $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION}	105 $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION}

105	106

106 endif	107 endif

OLD	NEW

« no previous file with comments | « .travis.yml ('k') | README.md » ('j') | no next file with comments »