Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4634)

Unified Diff: build/config/compiler/BUILD.gn

Issue 987553002: Audit GN cflags and defines to match GYP build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 43971510dbe6341bafce5e079ec4291571dcffa0..acdf45e6ecdc26b238c587ab2ee861aea157c153 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -100,10 +100,6 @@ config("compiler") {
"/GS", # Enable buffer security checking.
"/FS", # Preserve previous PDB behavior.
]
- if (is_component_build) {
- cflags += [ "/EHsc" ] # Assume C functions can't throw exceptions and don't catch
- # structured exceptions (only C++ ones).
- }
} else {
# Common GCC compiler flags setup.
# --------------------------------
@@ -534,9 +530,6 @@ config("runtime_library") {
} else {
# Static CRT.
if (is_win) {
- # We don't use exceptions, and when we link statically we can just get
- # rid of them entirely.
- defines += [ "_HAS_EXCEPTIONS=0" ]
if (is_debug) {
cflags += [ "/MTd" ]
} else {
@@ -548,10 +541,9 @@ config("runtime_library") {
if (is_win) {
defines += [
"__STD_C",
- "__STDC_CONSTANT_MACROS",
- "__STDC_FORMAT_MACROS",
"_CRT_RAND_S",
"_CRT_SECURE_NO_DEPRECATE",
+ "_HAS_EXCEPTIONS=0",
"_SCL_SECURE_NO_DEPRECATE",
]
}
« no previous file with comments | « build/config/BUILD.gn ('k') | build/config/features.gni » ('j') | skia/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698