Fix gyp_v8 to work with use_system_icu=1

If you want to use the system icu library, you'll need to use gyp_v8 (as
opposed to the standalone Makefiles)

BUG=v8:2475
R=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/19195003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15677 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/Makefile b/Makefile
index 74a416d..6e2b4fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -352,6 +352,7 @@ clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.cl
 # GYP file generation targets.
 OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES))
 $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
+       PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
        GYP_GENERATORS=make \
        build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
                      -Ibuild/standalone.gypi --depth=. \
@@ -359,6 +360,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
                      -S.$(subst .,,$(suffix $@)) $(GYPFLAGS)
 
 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
+       PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
        GYP_GENERATORS=make \
        build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
                      -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)

diff --git a/Makefile.android b/Makefile.android
index aeff01c..10f830d 100644 (file)
--- a/Makefile.android
+++ b/Makefile.android
@@ -93,6 +93,7 @@ $(ANDROID_MAKEFILES):
        GYP_DEFINES="${DEFINES}" \
        CC="${ANDROID_TOOLCHAIN}/bin/*-gcc" \
        CXX="${ANDROID_TOOLCHAIN}/bin/*-g++" \
+       PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
        build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
                      -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
                      -S.${ARCH} ${GYPFLAGS}

diff --git a/Makefile.nacl b/Makefile.nacl
index 0d053b1..02e83ef 100644 (file)
--- a/Makefile.nacl
+++ b/Makefile.nacl
@@ -91,6 +91,7 @@ $(NACL_MAKEFILES):
        GYP_DEFINES="${GYPENV}" \
        CC=${NACL_CC} \
        CXX=${NACL_CXX} \
+       PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
        build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
                      -Ibuild/standalone.gypi --depth=. \
                      -S.$(subst .,,$(suffix $@)) $(GYPFLAGS) \

diff --git a/build/gyp_v8 b/build/gyp_v8
index 73a66a7..92e6503 100755 (executable)
--- a/build/gyp_v8
+++ b/build/gyp_v8
@@ -47,6 +47,10 @@ if __name__ == '__main__':
 sys.path.insert(0, os.path.join(v8_root, 'build', 'gyp', 'pylib'))
 import gyp
 
+# Add paths so that pymod_do_main(...) can import files.
+sys.path.insert(
+    1, os.path.abspath(os.path.join(v8_root, 'tools', 'generate_shim_headers')))
+
 
 def apply_gyp_environment(file_path=None):
   """