Index: Makefile |
diff --git a/Makefile b/Makefile |
index 489210f05b34c4f4c0454f3d5d044429ea057cbd..f38c363d23a40be63402525bc31527ca72dbdf6a 100644 |
--- a/Makefile |
+++ b/Makefile |
@@ -31,9 +31,58 @@ CXX ?= "g++" # For distcc: export CXX="distcc g++" |
LINK ?= "g++" |
OUTDIR ?= out |
TESTJOBS ?= -j16 |
-GYPFLAGS ?= -Dv8_can_use_vfp_instructions=true |
- |
-# Architectures and modes to be compiled. |
+GYPFLAGS ?= |
+ |
+# Special build flags. Use them like this: "make library=shared" |
+ |
+# library=shared || component=shared_library |
+ifeq ($(library), shared) |
+ GYPFLAGS += -Dcomponent=shared_library |
+endif |
+ifdef $(component) |
+ GYPFLAGS += -Dcomponent=$(component) |
+endif |
+# console=readline |
+ifdef $(console) |
+ GYPFLAGS += -Dconsole=$(console) |
+endif |
+# disassembler=on |
+ifeq ($(disassembler), on) |
+ GYPFLAGS += -Dv8_enable_disassembler=1 |
+endif |
+# snapshot=off |
+ifeq ($(snapshot), off) |
+ GYPFLAGS += -Dv8_use_snapshot='false' |
+endif |
+# gdbjit=on |
+ifeq ($(gdbjit), on) |
+ GYPFLAGS += -Dv8_enable_gdbjit=1 |
+endif |
+# liveobjectlist=on |
+ifeq ($(liveobjectlist), on) |
+ GYPFLAGS += -Dv8_use_liveobjectlist=true |
+endif |
+# vfp3=off |
+ifeq ($(vfp3), off) |
+ GYPFLAGS += -Dv8_can_use_vfp_instructions=false |
+else |
+ GYPFLAGS += -Dv8_can_use_vfp_instructions=true |
+endif |
+ |
+# ----------------- available targets: -------------------- |
+# - any arch listed in ARCHES |
+# - any mode listed in MODES |
+# - every combination <arch>.<mode>, e.g. "ia32.release" |
+# - any of the above with .check appended, e.g. "ia32.release.check" |
+# - default (no target specified): build all ARCHES and MODES |
+# - "check": build all targets and run all tests |
+# - "<arch>.clean" for any <arch> in ARCHES |
+# - "clean": clean all ARCHES |
+ |
+# ----------------- internal stuff ------------------------ |
+ |
+# Architectures and modes to be compiled. Consider these to be internal |
+# variables, don't override them (use the targets instead). |
ARCHES = ia32 x64 arm |
MODES = release debug |
@@ -44,27 +93,29 @@ GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \ |
# Generates all combinations of ARCHES and MODES, e.g. "ia32.release". |
BUILDS = $(foreach mode,$(MODES),$(addsuffix .$(mode),$(ARCHES))) |
-CHECKS = $(addsuffix .check,$(BUILDS)) |
# Generates corresponding test targets, e.g. "ia32.release.check". |
+CHECKS = $(addsuffix .check,$(BUILDS)) |
+ENVFILE = $(OUTDIR)/environment |
-.PHONY: all release debug ia32 x64 arm $(BUILDS) |
- |
-# Target definitions. "all" is the default, you can specify any others on the |
-# command line, e.g. "make ia32". Targets defined in $(BUILDS), e.g. |
-# "ia32.debug", can also be specified. |
-all: release debug |
- |
-release: $(addsuffix .release,$(ARCHES)) |
+.PHONY: all clean generate_environment_file \ |
+ $(ARCHES) $(MODES) $(BUILDS) $(addsuffix .clean,$(ARCHES)) |
Yang
2011/08/26 07:26:42
trailing whitespace.
Jakob Kummerow
2011/08/26 09:45:33
Done.
|
-debug: $(addsuffix .debug,$(ARCHES)) |
+# Target definitions. "all" is the default. |
+all: $(MODES) |
-ia32: $(addprefix ia32.,$(MODES)) |
+# Store current GYPFLAGS in a file so we can trigger regeneration of |
+# gyp-generated Makefiles when they change. |
+generate_environment_file: |
+ @echo -e "GYPFLAGS=$(GYPFLAGS)" > $(ENVFILE).new; \ |
+ if test -r $(ENVFILE) && cmp $(ENVFILE).new $(ENVFILE) >/dev/null; then \ |
+ rm $(ENVFILE).new; \ |
+ else mv $(ENVFILE).new $(ENVFILE); fi |
Yang
2011/08/26 07:26:42
/bin/sh: out/environment.new: No such file or dire
Jakob Kummerow
2011/08/26 09:45:33
Done.
|
-x64: $(addprefix x64.,$(MODES)) |
+.SECONDEXPANSION: |
+$(MODES): $(addsuffix .$$@,$(ARCHES)) |
-arm: $(addprefix arm.,$(MODES)) |
+$(ARCHES): $(addprefix $$@.,$(MODES)) |
-.SECONDEXPANSION: |
$(BUILDS): $(OUTDIR)/Makefile-$$(basename $$@) |
@$(MAKE) -C "$(OUTDIR)" -f Makefile-$(basename $@) \ |
CXX="$(CXX)" LINK="$(LINK)" \ |
@@ -95,17 +146,19 @@ $(addsuffix .clean,$(ARCHES)): |
clean: $(addsuffix .clean,$(ARCHES)) |
# GYP file generation targets. |
-$(OUTDIR)/Makefile-ia32: $(GYPFILES) |
+$(OUTDIR)/Makefile-ia32: $(GYPFILES) $(ENVFILE) |
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ |
-Ibuild/standalone.gypi --depth=. -Dtarget_arch=ia32 -S-ia32 \ |
$(GYPFLAGS) |
-$(OUTDIR)/Makefile-x64: $(GYPFILES) |
+$(OUTDIR)/Makefile-x64: $(GYPFILES) $(ENVFILE) |
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ |
-Ibuild/standalone.gypi --depth=. -Dtarget_arch=x64 -S-x64 \ |
$(GYPFLAGS) |
-$(OUTDIR)/Makefile-arm: $(GYPFILES) build/armu.gypi |
+$(OUTDIR)/Makefile-arm: $(GYPFILES) $(ENVFILE) |
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ |
-Ibuild/standalone.gypi --depth=. -Ibuild/armu.gypi -S-arm \ |
$(GYPFLAGS) |
+ |
+$(ENVFILE): generate_environment_file |