From ea48c0c935c4aa0f46b1f6c1d202a42aaea5a659 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 30 Jan 2018 11:04:36 +0900 Subject: [PATCH] Enable use_custom_libcxx on Linux --- chromiumcontent/args/ffmpeg.gn | 6 ++++-- chromiumcontent/args/shared_library.gn | 6 ++++-- chromiumcontent/args/static_library.gn | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/chromiumcontent/args/ffmpeg.gn b/chromiumcontent/args/ffmpeg.gn index 0c7616e3..9629c525 100644 --- a/chromiumcontent/args/ffmpeg.gn +++ b/chromiumcontent/args/ffmpeg.gn @@ -7,8 +7,10 @@ proprietary_codecs = false is_component_ffmpeg = true ffmpeg_branding = "Chromium" -# Always use the system provided standard library -use_custom_libcxx = false +# Use the system provided standard library on platforms other than Linux. +if (target_os != "linux") { + use_custom_libcxx = false +} # Jumbo build should improve compilation times. # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md diff --git a/chromiumcontent/args/shared_library.gn b/chromiumcontent/args/shared_library.gn index b6c79aac..69887834 100644 --- a/chromiumcontent/args/shared_library.gn +++ b/chromiumcontent/args/shared_library.gn @@ -10,8 +10,10 @@ proprietary_codecs = true is_component_ffmpeg = true ffmpeg_branding = "Chrome" -# Always use the system provided standard library -use_custom_libcxx = false +# Use the system provided standard library on platforms other than Linux. +if (target_os != "linux") { + use_custom_libcxx = false +} # Jumbo build should improve compilation times. # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md diff --git a/chromiumcontent/args/static_library.gn b/chromiumcontent/args/static_library.gn index bf2ed7a8..ca56eeaa 100644 --- a/chromiumcontent/args/static_library.gn +++ b/chromiumcontent/args/static_library.gn @@ -14,8 +14,10 @@ ffmpeg_branding = "Chrome" # scenario is_cfi = false -# Always use the system provided standard library -use_custom_libcxx = false +# Use the system provided standard library on platforms other than Linux. +if (target_os != "linux") { + use_custom_libcxx = false +} # Jumbo build should improve compilation times. # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md