Side by Side Diff: Makefile
Issue 29812567:
Issue 6695 - allow to have prebuilt V8 for different nix plaforms locally (Closed)
Base URL: https://github.com/adblockplus/libadblockplus@aed024f124d0f38dc6fd03f53ad13bdb3ce987dc
Patch Set:
Created June 21, 2018, 9:23 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« .travis/prepare-prebuilt-v8.sh ('k')
|
README.md » ('j')
|
no next file with comments »
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 else ifeq (${raw_OS},Darwin) | 8 else ifeq (${raw_OS},Darwin) |
| 9 HOST_OS=mac | 9 HOST_OS=mac |
| 10 TRAVIS_OS_NAME=osx | 10 TRAVIS_OS_NAME=osx |
| 11 endif | 11 endif |
| 12 endif | 12 endif |
| 13 | 13 |
| 14 # Default V8 directories | |
| 15 LIBV8_INCLUDE_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/include | |
| 16 LIBV8_LIB_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/ | |
| 17 | |
| 18 TARGET_OS ?= ${HOST_OS} | 14 TARGET_OS ?= ${HOST_OS} |
| 19 TARGET_ARCH ?= ${HOST_ARCH} | 15 TARGET_ARCH ?= ${HOST_ARCH} |
| 20 Configuration ?= debug | 16 Configuration ?= debug |
| 21 | 17 |
| 18 # Default V8 directories | |
| 19 LIBV8_INCLUDE_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/include | |
| 20 LIBV8_LIB_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/${TARGET_OS}-${TARGET_A RCH}-${Configuration} | |
| 21 | |
| 22 BUILD_DIR ?=$(shell pwd -L)/build | 22 BUILD_DIR ?=$(shell pwd -L)/build |
| 23 | 23 |
| 24 ifeq (${TARGET_OS},android) | 24 ifeq (${TARGET_OS},android) |
| 25 Configuration ?= release | 25 Configuration ?= release |
| 26 ANDROID_PLATFORM_LEVEL=android-16 | 26 ANDROID_PLATFORM_LEVEL=android-16 |
| 27 ANDROID_FIXES= | 27 ANDROID_FIXES= |
| 28 ifeq ($(TARGET_ARCH),arm) | 28 ifeq ($(TARGET_ARCH),arm) |
| 29 ANDROID_ABI = armeabi-v7a | 29 ANDROID_ABI = armeabi-v7a |
| 30 ANDROID_FIXES="LOCAL_LDFLAGS=\"-Wl,--allow-multiple-definition\"" | 30 ANDROID_FIXES="LOCAL_LDFLAGS=\"-Wl,--allow-multiple-definition\"" |
| 31 else ifeq ($(TARGET_ARCH),ia32) | 31 else ifeq ($(TARGET_ARCH),ia32) |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 95 NDK_PROJECT_PATH=. \ | 95 NDK_PROJECT_PATH=. \ |
| 96 NDK_OUT=. \ | 96 NDK_OUT=. \ |
| 97 ${ANDROID_FIXES} \ | 97 ${ANDROID_FIXES} \ |
| 98 NDK_APP_DST_DIR=android-$(TARGET_ARCH).release | 98 NDK_APP_DST_DIR=android-$(TARGET_ARCH).release |
| 99 else | 99 else |
| 100 all: ensure_dependencies | 100 all: ensure_dependencies |
| 101 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp | 101 GYP_DEFINES="${GYP_PARAMETERS}" third_party/gyp/gyp --depth=. -f make -I libadblockplus.gypi --generator-output=${BUILD_DIR} libadblockplus.gyp |
| 102 $(MAKE) -C ${BUILD_DIR} | 102 $(MAKE) -C ${BUILD_DIR} |
| 103 | 103 |
| 104 endif | 104 endif |
| OLD | NEW |
« no previous file with comments
|
« .travis/prepare-prebuilt-v8.sh ('k')
|
README.md » ('j')
|
no next file with comments »
