Hard-code GYP_GENERATORS=make into top-level Makefile
removing the need to manually specify this on platforms where it's not the default (Mac). Review URL: https://chromiumcodereview.appspot.com/9877002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11175 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
82c0fec545
commit
28a33dddda
6
Makefile
6
Makefile
@ -211,31 +211,37 @@ clean: $(addsuffix .clean,$(ARCHES)) native.clean
|
||||
|
||||
# GYP file generation targets.
|
||||
$(OUTDIR)/Makefile-ia32: $(GYPFILES) $(ENVFILE)
|
||||
GYP_GENERATORS=make \
|
||||
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
||||
-Ibuild/standalone.gypi --depth=. -Dtarget_arch=ia32 \
|
||||
-S-ia32 $(GYPFLAGS)
|
||||
|
||||
$(OUTDIR)/Makefile-x64: $(GYPFILES) $(ENVFILE)
|
||||
GYP_GENERATORS=make \
|
||||
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
||||
-Ibuild/standalone.gypi --depth=. -Dtarget_arch=x64 \
|
||||
-S-x64 $(GYPFLAGS)
|
||||
|
||||
$(OUTDIR)/Makefile-arm: $(GYPFILES) $(ENVFILE) build/armu.gypi
|
||||
GYP_GENERATORS=make \
|
||||
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
||||
-Ibuild/standalone.gypi --depth=. -Ibuild/armu.gypi \
|
||||
-S-arm $(GYPFLAGS)
|
||||
|
||||
$(OUTDIR)/Makefile-mips: $(GYPFILES) $(ENVFILE) build/mipsu.gypi
|
||||
GYP_GENERATORS=make \
|
||||
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
||||
-Ibuild/standalone.gypi --depth=. -Ibuild/mipsu.gypi \
|
||||
-S-mips $(GYPFLAGS)
|
||||
|
||||
$(OUTDIR)/Makefile-native: $(GYPFILES) $(ENVFILE)
|
||||
GYP_GENERATORS=make \
|
||||
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
||||
-Ibuild/standalone.gypi --depth=. -S-native $(GYPFLAGS)
|
||||
|
||||
$(OUTDIR)/Makefile-android: $(GYPFILES) $(ENVFILE) build/android.gypi \
|
||||
must-set-ANDROID_NDK_ROOT
|
||||
GYP_GENERATORS=make \
|
||||
CC="${ANDROID_TOOL_PREFIX}-gcc" \
|
||||
build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
|
||||
-Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
|
||||
|
Loading…
Reference in New Issue
Block a user