Makefile - Issue 405113002: Add CXX cross-compile detection into Makefile after it was removed from gyp.

Keyboard Shortcuts

	File
u :	up to issue
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

	Issue
u :	up to list of issues
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

Unified Diff: Makefile

Issue 405113002: Add CXX cross-compile detection into Makefile after it was removed from gyp. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Makefile

diff --git a/Makefile b/Makefile

index 4a4786e4a590104f5d2f243c5d3040d8e4506ce0..1ec36999ac7817415f3c23c53d50fba8d3141960 100644

--- a/Makefile

+++ b/Makefile

@@ -399,11 +399,16 @@ clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.cl

# GYP file generation targets.

OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS))

$(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)

+ $(eval CXX_TARGET_ARCH:=$(shell $(CXX) -v 2>&1 | grep ^Target: | \

+ cut -f 2 -d " " | cut -f 1 -d "-" ))

+ $(eval V8_TARGET_ARCH:=$(subst .,,$(suffix $(basename $@))))

PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH):$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \

GYP_GENERATORS=make \

build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \

-Ibuild/standalone.gypi --depth=. \

- -Dv8_target_arch=$(subst .,,$(suffix $(basename $@))) \

+ -Dv8_target_arch=$(V8_TARGET_ARCH) \

+ $(if $(filter $(CXX_TARGET_ARCH),$(V8_TARGET_ARCH)), \

+ -Dtarget_arch=$(CXX_TARGET_ARCH),) \

$(if $(findstring optdebug,$@),-Dv8_optimized_debug=2,) \

-S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS)

« no previous file with comments | « no previous file | no next file » | no next file with comments »