Commit eb349805 authored by tony@chromium.org's avatar tony@chromium.org

[chromium] Fix compilation with clang and the shared build

https://bugs.webkit.org/show_bug.cgi?id=75492

Reviewed by Ojan Vafai.

* WebKit.gyp: Turn off -Wglobal-constructors because test files using
GTEST have global constructors.
* tests/InnerGestureRecognizerTest.cpp:
(TEST_F): Move global into test function.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@103980 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6bdb0925
2012-01-03 Tony Chang <tony@chromium.org>
[chromium] Fix compilation with clang and the shared build
https://bugs.webkit.org/show_bug.cgi?id=75492
Reviewed by Ojan Vafai.
* WebKit.gyp: Turn off -Wglobal-constructors because test files using
GTEST have global constructors.
* tests/InnerGestureRecognizerTest.cpp:
(TEST_F): Move global into test function.
2012-01-03 Adrienne Walker <enne@google.com>
[chromium] Revert accidentally removed chrome client compositing check
......
......@@ -745,6 +745,13 @@
'<(chromium_src_dir)/third_party/nss/nss.gyp:*',
],
}],
['clang==1', {
# FIXME: It would be nice to enable this in shared builds too,
# but the test files have global constructors from the GTEST macro
# and we pull in the test files into the webkit target in the
# shared build.
'cflags!': ['-Wglobal-constructors'],
}],
],
'msvs_settings': {
'VCLinkerTool': {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment