Side by Side Diff: Makefile
Issue 29817566:
Noissue - Use clang++ and libc++ on Linux (Closed)
Base URL: https://hg.adblockplus.org/libadblockplus/
Patch Set: Added note about libc++
Created June 28, 2018, 2:11 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« .travis.yml ('k')
|
README.md » ('j')
|
README.md » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 |
