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

Unified 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.
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
« no previous file with comments | « .travis/prepare-prebuilt-v8.sh ('k') | README.md » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile
diff --git a/Makefile b/Makefile
index d0e5e78a66415156c56a416330dfd381304c7213..5b1ceb7d263312ee301be6bc5047005ad6d06c05 100644
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,14 @@ ifndef HOST_OS
endif
endif
-# Default V8 directories
-LIBV8_INCLUDE_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/include
-LIBV8_LIB_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/
-
TARGET_OS ?= ${HOST_OS}
TARGET_ARCH ?= ${HOST_ARCH}
Configuration ?= debug
+# Default V8 directories
+LIBV8_INCLUDE_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/include
+LIBV8_LIB_DIR ?= $(shell pwd -L)/third_party/prebuilt-v8/${TARGET_OS}-${TARGET_ARCH}-${Configuration}
+
BUILD_DIR ?=$(shell pwd -L)/build
ifeq (${TARGET_OS},android)
« no previous file with comments | « .travis/prepare-prebuilt-v8.sh ('k') | README.md » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld