Skip to content

Commit 817db30

Browse files
Refactor .gyp files:
common.gypi now contains global target defaults and is included by all .gyp files; standalone.gypi contains definitions for stand-alone v8 builds. This fixes d8 for the ARM simulator. TEST=compiles and tests pass on all platforms Review URL: http://codereview.chromium.org/7740020 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@9019 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
1 parent 1b54636 commit 817db30

File tree

11 files changed

+428
-567
lines changed

11 files changed

+428
-567
lines changed

Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ARCHES = ia32 x64 arm
3838
MODES = release debug
3939

4040
# List of files that trigger Makefile regeneration:
41-
GYPFILES = build/all.gyp build/common.gypi build/v8-features.gypi \
41+
GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \
4242
preparser/preparser.gyp samples/samples.gyp src/d8.gyp \
4343
test/cctest/cctest.gyp tools/gyp/v8.gyp
4444

@@ -90,21 +90,22 @@ $(addsuffix .clean,$(ARCHES)):
9090
rm -f $(OUTDIR)/Makefile-$(basename $@)
9191
rm -rf $(OUTDIR)/$(basename $@).release
9292
rm -rf $(OUTDIR)/$(basename $@).debug
93+
find $(OUTDIR) -regex '.*\(host\|target\)-$(basename $@)\.mk' -delete
9394

9495
clean: $(addsuffix .clean,$(ARCHES))
9596

9697
# GYP file generation targets.
9798
$(OUTDIR)/Makefile-ia32: $(GYPFILES)
9899
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
99-
-Ibuild/common.gypi --depth=. -Dtarget_arch=ia32 -S-ia32 \
100+
-Ibuild/standalone.gypi --depth=. -Dtarget_arch=ia32 -S-ia32 \
100101
$(GYPFLAGS)
101102

102103
$(OUTDIR)/Makefile-x64: $(GYPFILES)
103104
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
104-
-Ibuild/common.gypi --depth=. -Dtarget_arch=x64 -S-x64 \
105+
-Ibuild/standalone.gypi --depth=. -Dtarget_arch=x64 -S-x64 \
105106
$(GYPFLAGS)
106107

107108
$(OUTDIR)/Makefile-arm: $(GYPFILES) build/armu.gypi
108109
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
109-
-Ibuild/common.gypi --depth=. -Ibuild/armu.gypi -S-arm \
110+
-Ibuild/standalone.gypi --depth=. -Ibuild/armu.gypi -S-arm \
110111
$(GYPFLAGS)

0 commit comments

Comments
 (0)