Makefile - Issue 1929473002: [build] Move gyp folder

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Makefile

Issue 1929473002: [build] Move gyp folder (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Makefile

diff --git a/Makefile b/Makefile

index 6570a39e284f8daa918f742094c5bfe41a3fb6dc..8bdffd593db9659322bdf42114538f144d6a33de 100644

--- a/Makefile

+++ b/Makefile

@@ -447,9 +447,9 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)

$(eval CXX_TARGET_ARCH:=$(subst aarch64,arm64,$(CXX_TARGET_ARCH)))

$(eval CXX_TARGET_ARCH:=$(subst x86_64,x64,$(CXX_TARGET_ARCH)))

$(eval V8_TARGET_ARCH:=$(subst .,,$(suffix $(basename $@))))

- PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH):$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \

+ PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \

GYP_GENERATORS=make \

- build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \

+ tools/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \

-Ibuild/standalone.gypi --depth=. \

-Dv8_target_arch=$(V8_TARGET_ARCH) \

$(if $(findstring $(CXX_TARGET_ARCH),$(V8_TARGET_ARCH)), \

@@ -458,9 +458,9 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)

-S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS)

$(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)

- PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH):$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \

+ PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \

GYP_GENERATORS=make \

- build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \

+ tools/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \

-Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)

# Note that NACL_SDK_ROOT must be set to point to an appropriate

« no previous file with comments | « DEPS ('k') | Makefile.android » ('j') | no next file with comments »