From 4923e3cfbc2b617614858c427fa87a8c67aca784 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Thu, 31 Jul 2014 15:17:36 -0700 Subject: gn: cross-platform exception disable Goes with https://codereview.chromium.org/431803003/ R=jam@chromium.org BUG=chromium:354261 Review URL: https://codereview.chromium.org/426153007 --- BUILD.gn | 65 ++++++++++++++++++++++++++-------------------------------------- 1 file changed, 26 insertions(+), 39 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 9ecd70830e..f562c1ed09 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -85,9 +85,8 @@ static_library("pdfium") { libs = [] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] deps = [ @@ -138,9 +137,8 @@ static_library("fdrm") { "core/src/fdrm/crypto/fx_crypt_sha.cpp", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] } @@ -170,9 +168,8 @@ static_library("fpdfdoc") { "core/src/fpdfdoc/tagged_int.h", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] } @@ -297,9 +294,8 @@ static_library("fpdfapi") { "core/src/fpdfapi/fpdf_render/render_int.h", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] } @@ -315,9 +311,8 @@ static_library("fpdftext") { "core/src/fpdftext/unicodenormalizationdata.cpp", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] } @@ -484,9 +479,8 @@ static_library("fxcodec") { "core/src/fxcodec/libjpeg/transupp.h", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] if (is_posix) { # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int @@ -538,9 +532,8 @@ static_library("fxcrt") { "core/src/fxcrt/xml_int.h", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] } @@ -646,9 +639,8 @@ static_library("fxge") { ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] if (pdf_use_skia) { @@ -699,9 +691,8 @@ static_library("fxedit") { "fpdfsdk/src/fxedit/fxet_pageobjs.cpp", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] } @@ -745,9 +736,8 @@ static_library("pdfwindow") { "fpdfsdk/src/pdfwindow/PWL_Wnd.cpp", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] } @@ -798,9 +788,8 @@ static_library("javascript") { ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] include_dirs = [ "//v8", @@ -819,9 +808,8 @@ static_library("jsapi") { ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] include_dirs = [ "//v8", @@ -860,8 +848,7 @@ static_library("formfiller") { "fpdfsdk/src/formfiller/FFL_Utils.cpp", ] configs -= [ "//build/config/compiler:chromium_code" ] - if (is_posix) { - configs -= [ "//build/config/gcc:no_exceptions" ] - } + configs -= [ "//build/config/compiler:no_exceptions" ] + configs += [ "//build/config/compiler:exceptions" ] configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ] } -- cgit v1.2.3