Revision: 22509
Author: [email protected]
Date: Mon Jul 21 15:25:50 2014 UTC
Log: Add CXX cross-compile detection into Makefile after it was
removed from gyp.
[email protected]
Review URL: https://codereview.chromium.org/405113002
http://code.google.com/p/v8/source/detail?r=22509
Modified:
/branches/bleeding_edge/Makefile
=======================================
--- /branches/bleeding_edge/Makefile Wed Jul 9 11:08:26 2014 UTC
+++ /branches/bleeding_edge/Makefile Mon Jul 21 15:25:50 2014 UTC
@@ -399,11 +399,16 @@
# 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)
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
