Link with libcc's libc++ on Linux

54J4N · Feb 23, 2018 · 9fec1a3 · 9fec1a3
1 parent b7b40d9
commit 9fec1a3
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/common.gypi b/common.gypi
@@ -182,7 +182,10 @@
               '-Wl,--no-whole-archive',
             ],
           }, {
-            'libraries': [ '<@(libchromiumcontent_v8_libraries)' ],
+            'libraries': [
+              '<@(libchromiumcontent_v8_libraries)',
+              '<(libchromiumcontent_dir)/libc++.so',
+            ],
           }],
         ],
       }],
@@ -243,6 +246,22 @@
           }],  # OS=="win"
         ],
       }],
+      ['OS=="linux" and _target_name in ["dump_syms"]', {
+        'conditions': [
+          ['libchromiumcontent_component==0', {
+            'libraries': [
+              '<(libchromiumcontent_dir)/libc++.a',
+            ],
+          }, {
+            'libraries': [
+              '<(libchromiumcontent_dir)/libc++.so',
+            ],
+            'ldflags': [
+              '-Wl,-rpath=\$$ORIGIN',
+            ],
+          }],
+        ],
+      }]
     ],
     'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail.
     'msvs_disabled_warnings': [

diff --git a/toolchain.gypi b/toolchain.gypi
@@ -110,9 +110,6 @@
         ['CXX.host', '$(CXX)'],
       ],
       'target_defaults': {
-        'cflags_cc': [
-          '-std=c++14',
-        ],
         'xcode_settings': {
           'CC': '<(make_clang_dir)/bin/clang',
           'LDPLUSPLUS': '<(make_clang_dir)/bin/clang++',
@@ -125,13 +122,24 @@
           'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',  # -std=c++14
         },
         'target_conditions': [
-          ['_type in ["executable", "shared_library"]', {
+          ['OS=="mac" and _type in ["executable", "shared_library"]', {
             'xcode_settings': {
               # On some machines setting CLANG_CXX_LIBRARY doesn't work for
               # linker.
               'OTHER_LDFLAGS': [ '-stdlib=libc++' ],
             },
           }],
+          ['OS=="linux"', {
+            'cflags_cc': [
+              '-std=gnu++14',
+              '-nostdinc++',
+              '-isystem<(libchromiumcontent_src_dir)/buildtools/third_party/libc++/trunk/include',
+              '-isystem<(libchromiumcontent_src_dir)/buildtools/third_party/libc++abi/trunk/include',
+            ],
+            'ldflags': [
+              '-nostdlib++',
+            ],
+          }],
         ],
       },
     }],  # clang==1
@@ -145,7 +153,7 @@
       ],
       'target_defaults': {
         'cflags_cc': [
-          '-std=c++11',
+          '-std=gnu++14',
         ],
       },
     }],

diff --git a/vendor/libchromiumcontent b/vendor/libchromiumcontent
+13 −0		chromiumcontent/BUILD.gn
+4 −2		chromiumcontent/args/ffmpeg.gn
+4 −2		chromiumcontent/args/shared_library.gn
+4 −2		chromiumcontent/args/static_library.gn
+9 −0		chromiumcontent/build_libs.py
+5 −60		patches/003-accelerator.patch
+11 −0		patches/007-blink_local_frame.patch
+0 −13		patches/033-synthetic_gesture_target_mac.patch
+8 −0		patches/034-thread_capabilities.patch
+0 −20		patches/044-ignore_unused_local_var.patch
+130 −0		patches/075-can_disable_desktop_capture_throttling.patch
+122 −0		patches/third_party/webrtc/002-webrtc-desktop_capturer_mac.patch
+37 −0		patches/third_party/webrtc/003-webrtc-rwlock_null.patch
+3 −12		script/bootstrap
+9 −41		script/create-dist
+3 −9		script/download
+38 −0		script/lib/filesystem.py
+36 −0		script/lib/gn.py
+12 −0		script/lib/util.py
+41 −90		script/update
+0 −1		script/upload