RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
tdesktop/Telegram/Patches/macold/mini_chromium.diff

29 lines
977 B
Diff
Raw Normal View History

Using custom build of libc++ for old OS X version. 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.
2017-02-17 09:48:31 +00:00
diff --git a/build/common.gypi b/build/common.gypi
Update instructions for Xcode 10.1.
2019-01-05 12:34:34 +00:00
index 1affc70..0677e4b 100644
Using custom build of libc++ for old OS X version. 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.
2017-02-17 09:48:31 +00:00
--- a/build/common.gypi
+++ b/build/common.gypi
Update instructions for Xcode 10.1.
2019-01-05 12:34:34 +00:00
@@ -66,6 +66,13 @@
Using custom build of libc++ for old OS X version. 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.
2017-02-17 09:48:31 +00:00
'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',
Update instructions for Xcode 10.1.
2019-01-05 12:34:34 +00:00
+ '-isysroot/',
+ '-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/',
Using custom build of libc++ for old OS X version. 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.
2017-02-17 09:48:31 +00:00
+ ],
# Don't link in libarclite_macosx.a, see http://crbug.com/156530.
'CLANG_LINK_OBJC_RUNTIME': 'NO', # -fno-objc-link-runtime
Update instructions for Xcode 10.1.
2019-01-05 12:34:34 +00:00
@@ -116,6 +123,9 @@
Using custom build of libc++ for old OS X version. 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.
2017-02-17 09:48:31 +00:00
],
},
+ 'include_dirs': [
+ '/usr/local/macold/include/c++/v1',
+ ],
}],
['OS=="linux"', {