Commit 1c207ae9 by Corentin Wallez

dEQP.gypi: tweaks to enable in-Chromium compilation on Linux

Two things were needed: - The re-enabling of exception and RTTI as it is disabled in Chromium and in a different way than in ANGLE standalone - Link decpp with dl BUG=angleproject:1127 Change-Id: I9ac37545762dc13320c7fba418fba82d7961e83e Reviewed-on: https://chromium-review.googlesource.com/294822Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent f41e04db
......@@ -361,6 +361,9 @@
'cflags':
[
'-pthread',
],
'cflags_cc':
[
'-fno-exceptions',
],
'ldflags':
......
......@@ -1032,9 +1032,11 @@
},
},
},
'cflags!':
# Re-enable RTTI and exceptions, dEQP needs them.
'cflags_cc!':
[
'-fno-exceptions', # dEQP requires exceptions
'-fno-exceptions',
'-fno-rtti',
],
'msvs_disabled_warnings':
[
......@@ -1058,6 +1060,17 @@
[
'<@(deqp_libtester_decpp_sources)',
],
# In a chromium build dl is required for deDynamicLibrary
'conditions':
[
['OS=="linux"',
{
'link_settings':
{
'libraries': ['-ldl']
},
}],
],
},
{
......
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