Differential D18757 Diff 55245 www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn
--- src/3rdparty/chromium/build/config/BUILD.gn.orig 2017-01-26 00:49:07 UTC | --- src/3rdparty/chromium/build/config/BUILD.gn.orig 2018-11-13 18:25:11 UTC | ||||
+++ src/3rdparty/chromium/build/config/BUILD.gn | +++ src/3rdparty/chromium/build/config/BUILD.gn | ||||
@@ -224,7 +224,7 @@ config("debug") { | @@ -171,7 +171,7 @@ config("debug") { | ||||
# builds, and we have to tell it to turn it off. | # builds, and we have to tell it to turn it off. | ||||
defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] | defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] | ||||
} | } | ||||
- } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { | - } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { | ||||
+ } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { | + } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { | ||||
# Enable libstdc++ debugging facilities to help catch problems early, see | # Enable libstdc++ debugging facilities to help catch problems early, see | ||||
# http://crbug.com/65151 . | # http://crbug.com/65151 . | ||||
# TODO(phajdan.jr): Should we enable this for all of POSIX? | # TODO(phajdan.jr): Should we enable this for all of POSIX? | ||||
@@ -338,7 +338,7 @@ config("executable_config") { | @@ -273,9 +273,7 @@ config("default_libs") { | ||||
] | ] | ||||
} else if (is_ios) { | } else if (is_linux) { | ||||
configs += [ "//build/config/ios:ios_dynamic_flags" ] | libs = [ | ||||
- } else if (is_linux || is_android) { | - "dl", | ||||
+ } else if (is_linux || is_android || is_bsd) { | "pthread", | ||||
- "rt", | |||||
] | |||||
} | |||||
} | |||||
@@ -331,7 +329,7 @@ config("executable_config") { | |||||
"//build/config/ios:ios_dynamic_flags", | |||||
"//build/config/ios:ios_executable_flags", | |||||
] | |||||
- } else if (is_linux || is_android || current_os == "aix") { | |||||
+ } else if (is_linux || is_bsd || is_android || current_os == "aix") { | |||||
configs += [ "//build/config/gcc:executable_ldconfig" ] | configs += [ "//build/config/gcc:executable_ldconfig" ] | ||||
if (is_android) { | if (is_android) { | ||||
configs += [ "//build/config/android:executable_config" ] | configs += [ "//build/config/android:executable_config" ] |