Reviewers: Benedikt Meurer,
Message:
* fix i18nsupport=off
* fix building with gcc
https://codereview.chromium.org/876323002/diff/1/Makefile
File Makefile (right):
https://codereview.chromium.org/876323002/diff/1/Makefile#newcode56
Makefile:56: ifeq ($(clang), on)
Maybe this should check for 'off', to keep the default `make` behavior
the same?
Description:
Fix i18nsupport=off standalone build.
Please review this at https://codereview.chromium.org/876323002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+19, -11 lines):
M Makefile
Index: Makefile
diff --git a/Makefile b/Makefile
index
5468d913341e31c34b214079c3e72187d0bec6ae..a982d660001f6cfc4451a2b16aee4206e239ec1a
100644
--- a/Makefile
+++ b/Makefile
@@ -37,12 +37,29 @@ ANDROID_TOOLCHAIN ?=
ANDROID_V8 ?= /data/local/tmp/v8
NACL_SDK_ROOT ?=
+# List of files that trigger Makefile regeneration:
+GYPFILES = build/shim_headers.gypi build/features.gypi
build/standalone.gypi \
+ build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
+ build/android.gypi test/cctest/cctest.gyp \
+ test/unittests/unittests.gyp tools/gyp/v8.gyp \
+ tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
+ samples/samples.gyp \
+ src/third_party/vtune/v8vtune.gyp src/d8.gyp
+
# Special build flags. Use them like this: "make library=shared"
# library=shared || component=shared_library
ifeq ($(library), shared)
GYPFLAGS += -Dcomponent=shared_library
endif
+# clang=on
+ifeq ($(clang), on)
+ GYPFILES += buildtools/third_party/libc++abi/libc++abi.gyp \
+ buildtools/third_party/libc++/libc++.gyp
+ GYPFLAGS += -Dclang=1
+else
+ GYPFLAGS += -Dclang=0
+endif
ifdef component
GYPFLAGS += -Dcomponent=$(component)
endif
@@ -140,6 +157,8 @@ endif
ifeq ($(i18nsupport), off)
GYPFLAGS += -Dv8_enable_i18n_support=0
TESTFLAGS += --noi18n
+else
+ GYPFILES += third_party/icu/icu.gypi third_party/icu/icu.gyp
endif
# deprecation_warnings=on
ifeq ($(deprecationwarnings), on)
@@ -237,17 +256,6 @@ DEFAULT_MODES = release debug
ANDROID_ARCHES = android_ia32 android_arm android_arm64 android_mipsel
android_x87
NACL_ARCHES = nacl_ia32 nacl_x64
-# List of files that trigger Makefile regeneration:
-GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
- build/shim_headers.gypi build/features.gypi build/standalone.gypi \
- build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
- build/android.gypi test/cctest/cctest.gyp \
- test/unittests/unittests.gyp tools/gyp/v8.gyp \
- tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
- buildtools/third_party/libc++abi/libc++abi.gyp \
- buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
- src/third_party/vtune/v8vtune.gyp src/d8.gyp
-
# If vtunejit=on, the v8vtune.gyp will be appended.
ifeq ($(vtunejit), on)
GYPFILES += src/third_party/vtune/v8vtune.gyp
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
