mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-01-25 00:34:49 +00:00
27f015561a
This will allow us to use C++14 library on all platforms. Patches for macold versions got bigger and are now different for crashpad and mini_chromium, so they were moved to a separate folder.
27 lines
820 B
Diff
27 lines
820 B
Diff
diff --git a/build/common.gypi b/build/common.gypi
|
|
index 1affc70..c0d2f6a 100644
|
|
--- a/build/common.gypi
|
|
+++ b/build/common.gypi
|
|
@@ -66,6 +66,11 @@
|
|
'conditions': [
|
|
['clang!=0', {
|
|
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11
|
|
+ 'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
|
|
+ 'OTHER_LDFLAGS': [
|
|
+ '/usr/local/macold/lib/libc++.a',
|
|
+ '/usr/local/macold/lib/libc++abi.a',
|
|
+ ],
|
|
|
|
# Don't link in libarclite_macosx.a, see http://crbug.com/156530.
|
|
'CLANG_LINK_OBJC_RUNTIME': 'NO', # -fno-objc-link-runtime
|
|
@@ -116,6 +121,9 @@
|
|
],
|
|
|
|
},
|
|
+ 'include_dirs': [
|
|
+ '/usr/local/macold/include/c++/v1',
|
|
+ ],
|
|
}],
|
|
|
|
['OS=="linux"', {
|