Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side 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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \ 95 APP_PLATFORM=${ANDROID_PLATFORM_LEVEL} \
94 APP_PIE=true \ 96 APP_PIE=true \
95 APP_STL=c++_shared \ 97 APP_STL=c++_shared \
96 APP_BUILD_SCRIPT=Makefile \ 98 APP_BUILD_SCRIPT=Makefile \
97 NDK_PROJECT_PATH=. \ 99 NDK_PROJECT_PATH=. \
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
105 ifdef CXX
106 CXX_PARAM:=CXX=${CXX}
107 endif
103 all: ensure_dependencies 108 all: ensure_dependencies
104 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
105 » $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION} 110 » $(MAKE) -C ${BUILD_DIR} ${SUB_ACTION} ${CXX_PARAM}
106 111
107 endif 112 endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld