Link with libcc's libc++ on Linux
This commit is contained in:
parent
b7b40d9c3a
commit
9fec1a3cb4
3 changed files with 34 additions and 7 deletions
21
common.gypi
21
common.gypi
|
@ -182,7 +182,10 @@
|
||||||
'-Wl,--no-whole-archive',
|
'-Wl,--no-whole-archive',
|
||||||
],
|
],
|
||||||
}, {
|
}, {
|
||||||
'libraries': [ '<@(libchromiumcontent_v8_libraries)' ],
|
'libraries': [
|
||||||
|
'<@(libchromiumcontent_v8_libraries)',
|
||||||
|
'<(libchromiumcontent_dir)/libc++.so',
|
||||||
|
],
|
||||||
}],
|
}],
|
||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
|
@ -243,6 +246,22 @@
|
||||||
}], # OS=="win"
|
}], # 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_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail.
|
||||||
'msvs_disabled_warnings': [
|
'msvs_disabled_warnings': [
|
||||||
|
|
|
@ -110,9 +110,6 @@
|
||||||
['CXX.host', '$(CXX)'],
|
['CXX.host', '$(CXX)'],
|
||||||
],
|
],
|
||||||
'target_defaults': {
|
'target_defaults': {
|
||||||
'cflags_cc': [
|
|
||||||
'-std=c++14',
|
|
||||||
],
|
|
||||||
'xcode_settings': {
|
'xcode_settings': {
|
||||||
'CC': '<(make_clang_dir)/bin/clang',
|
'CC': '<(make_clang_dir)/bin/clang',
|
||||||
'LDPLUSPLUS': '<(make_clang_dir)/bin/clang++',
|
'LDPLUSPLUS': '<(make_clang_dir)/bin/clang++',
|
||||||
|
@ -125,13 +122,24 @@
|
||||||
'CLANG_CXX_LANGUAGE_STANDARD': 'c++14', # -std=c++14
|
'CLANG_CXX_LANGUAGE_STANDARD': 'c++14', # -std=c++14
|
||||||
},
|
},
|
||||||
'target_conditions': [
|
'target_conditions': [
|
||||||
['_type in ["executable", "shared_library"]', {
|
['OS=="mac" and _type in ["executable", "shared_library"]', {
|
||||||
'xcode_settings': {
|
'xcode_settings': {
|
||||||
# On some machines setting CLANG_CXX_LIBRARY doesn't work for
|
# On some machines setting CLANG_CXX_LIBRARY doesn't work for
|
||||||
# linker.
|
# linker.
|
||||||
'OTHER_LDFLAGS': [ '-stdlib=libc++' ],
|
'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
|
}], # clang==1
|
||||||
|
@ -145,7 +153,7 @@
|
||||||
],
|
],
|
||||||
'target_defaults': {
|
'target_defaults': {
|
||||||
'cflags_cc': [
|
'cflags_cc': [
|
||||||
'-std=c++11',
|
'-std=gnu++14',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
}],
|
}],
|
||||||
|
|
2
vendor/libchromiumcontent
vendored
2
vendor/libchromiumcontent
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit f8ff573e503dea08f8ef05a2773bf3b0aa8dfdb1
|
Subproject commit 5964d8fe1ef813028d53c6496857ca84d9d91fd3
|
Loading…
Reference in a new issue