@@ -32,7 +32,6 @@ LINK ?= "g++"
32
32
OUTDIR ?= out
33
33
TESTJOBS ?= -j16
34
34
GYPFLAGS ?=
35
- TESTFLAGS ?=
36
35
37
36
# Special build flags. Use them like this: "make library=shared"
38
37
51
50
ifeq ($(disassembler ) , on)
52
51
GYPFLAGS += -Dv8_enable_disassembler=1
53
52
endif
54
- # objectprint=on
55
- ifeq ($(objectprint ) , on)
56
- GYPFLAGS += -Dv8_object_print=1
57
- endif
58
53
# snapshot=off
59
54
ifeq ($(snapshot ) , off)
60
55
GYPFLAGS += -Dv8_use_snapshot='false'
@@ -77,21 +72,12 @@ endif
77
72
ifdef soname_version
78
73
GYPFLAGS += -Dsoname_version=$(soname_version )
79
74
endif
80
- # werror=no
81
- ifeq ($(werror ) , no)
82
- GYPFLAGS += -Dwerror=''
83
- endif
84
- # presubmit=no
85
- ifeq ($(presubmit ) , no)
86
- TESTFLAGS += --no-presubmit
87
- endif
88
75
89
76
# ----------------- available targets: --------------------
90
77
# - "dependencies": pulls in external dependencies (currently: GYP)
91
78
# - any arch listed in ARCHES (see below)
92
79
# - any mode listed in MODES
93
80
# - every combination <arch>.<mode>, e.g. "ia32.release"
94
- # - "native": current host's architecture, release mode
95
81
# - any of the above with .check appended, e.g. "ia32.release.check"
96
82
# - default (no target specified): build all ARCHES and MODES
97
83
# - "check": build all targets and run all tests
@@ -117,7 +103,7 @@ CHECKS = $(addsuffix .check,$(BUILDS))
117
103
# File where previously used GYPFLAGS are stored.
118
104
ENVFILE = $(OUTDIR ) /environment
119
105
120
- .PHONY : all check clean dependencies $(ENVFILE ) .new native \
106
+ .PHONY : all check clean dependencies $(ENVFILE ) .new \
121
107
$(ARCHES) $(MODES) $(BUILDS) $(CHECKS) $(addsuffix .clean,$(ARCHES)) \
122
108
$(addsuffix .check,$(MODES)) $(addsuffix .check,$(ARCHES))
123
109
@@ -138,31 +124,21 @@ $(BUILDS): $(OUTDIR)/Makefile-$$(basename $$@)
138
124
python -c " print raw_input().capitalize()" ) \
139
125
builddir=" $( shell pwd) /$( OUTDIR) /$@ "
140
126
141
- native : $(OUTDIR ) /Makefile-native
142
- @$(MAKE ) -C " $( OUTDIR) " -f Makefile-native \
143
- CXX=" $( CXX) " LINK=" $( LINK) " BUILDTYPE=Release \
144
- builddir=" $( shell pwd) /$( OUTDIR) /$@ "
145
-
146
127
# Test targets.
147
128
check : all
148
- @tools/test-wrapper-gypbuild.py $(TESTJOBS ) --outdir=$(OUTDIR ) \
149
- $(TESTFLAGS )
129
+ @tools/test-wrapper-gypbuild.py $(TESTJOBS ) --outdir=$(OUTDIR )
150
130
151
131
$(addsuffix .check,$(MODES ) ) : $$(basename $$@ )
152
132
@tools/test-wrapper-gypbuild.py $(TESTJOBS ) --outdir=$(OUTDIR ) \
153
- --mode=$(basename $@ ) $( TESTFLAGS )
133
+ --mode=$(basename $@ )
154
134
155
135
$(addsuffix .check,$(ARCHES ) ) : $$(basename $$@ )
156
136
@tools/test-wrapper-gypbuild.py $(TESTJOBS ) --outdir=$(OUTDIR ) \
157
- --arch=$(basename $@ ) $( TESTFLAGS )
137
+ --arch=$(basename $@ )
158
138
159
139
$(CHECKS ) : $$(basename $$@ )
160
140
@tools/test-wrapper-gypbuild.py $(TESTJOBS ) --outdir=$(OUTDIR ) \
161
- --arch-and-mode=$(basename $@ ) $(TESTFLAGS )
162
-
163
- native.check : native
164
- @tools/test-wrapper-gypbuild.py $(TESTJOBS ) --outdir=$(OUTDIR ) /native \
165
- --arch-and-mode=. $(TESTFLAGS )
141
+ --arch-and-mode=$(basename $@ )
166
142
167
143
# Clean targets. You can clean each architecture individually, or everything.
168
144
$(addsuffix .clean,$(ARCHES ) ) :
@@ -171,12 +147,7 @@ $(addsuffix .clean,$(ARCHES)):
171
147
rm -rf $(OUTDIR ) /$(basename $@ ) .debug
172
148
find $(OUTDIR ) -regex ' .*\(host\|target\)-$(basename $@)\.mk' -delete
173
149
174
- native.clean :
175
- rm -f $(OUTDIR ) /Makefile-native
176
- rm -rf $(OUTDIR ) /native
177
- find $(OUTDIR ) -regex ' .*\(host\|target\)-native\.mk' -delete
178
-
179
- clean : $(addsuffix .clean,$(ARCHES ) ) native.clean
150
+ clean : $(addsuffix .clean,$(ARCHES ) )
180
151
181
152
# GYP file generation targets.
182
153
$(OUTDIR ) /Makefile-ia32 : $(GYPFILES ) $(ENVFILE )
@@ -194,10 +165,6 @@ $(OUTDIR)/Makefile-arm: $(GYPFILES) $(ENVFILE)
194
165
-Ibuild/standalone.gypi --depth=. -Ibuild/armu.gypi \
195
166
-S-arm $(GYPFLAGS )
196
167
197
- $(OUTDIR ) /Makefile-native : $(GYPFILES ) $(ENVFILE )
198
- build/gyp/gyp --generator-output=" $( OUTDIR) " build/all.gyp \
199
- -Ibuild/standalone.gypi --depth=. -S-native $(GYPFLAGS )
200
-
201
168
# Replaces the old with the new environment file if they're different, which
202
169
# will trigger GYP to regenerate Makefiles.
203
170
$(ENVFILE ) : $(ENVFILE ) .new
0 commit comments