Telegram: try to fix build for x64 again

* remove -pipe option
* use -Ofast optimisation (as for Linux)
* don't use multi-job compilation
This commit is contained in:
Gerasim Troeglazov
2020-01-07 13:00:38 +10:00
parent 45d2317720
commit a354293d69
2 changed files with 34 additions and 2 deletions

View File

@@ -4343,7 +4343,7 @@ index b3d7ff4..37fd1eb 100644
2.24.1
From b26ccb6d1df0dd08562c0ee39a42a2a59146c2c4 Mon Sep 17 00:00:00 2001
From bcce700284bed71887c9cba091ea51dab14f8c92 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 6 Jan 2020 21:41:41 +1000
Subject: Don't include SupportDefs.h
@@ -4412,3 +4412,34 @@ index 9eb64e8..e592a75 100644
--
2.24.1
From 156d8e7b9b8f6ba585d469595756ff697a6e1d0e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 7 Jan 2020 12:57:27 +1000
Subject: Remove -pipe compiler options and use -Ofast optimisation
diff --git a/cmake/options_haiku.cmake b/cmake/options_haiku.cmake
index 677cb36..063f1ce 100644
--- a/cmake/options_haiku.cmake
+++ b/cmake/options_haiku.cmake
@@ -5,8 +5,7 @@
target_compile_options(common_options
INTERFACE
- $<IF:$<CONFIG:Debug>,,-O3 -fno-strict-aliasing>
- -pipe
+ $<IF:$<CONFIG:Debug>,,-Ofast -fno-strict-aliasing>
-fPIC
-mmmx
-msse2
@@ -27,5 +26,5 @@ INTERFACE
)
target_link_options(common_options
INTERFACE
- $<IF:$<CONFIG:Debug>,,-O3>
+ $<IF:$<CONFIG:Debug>,,-Ofast>
)
--
2.24.1

View File

@@ -125,7 +125,8 @@ BUILD()
-DTDESKTOP_API_HASH=$TELEGRAM_API_HASH
export DISABLE_ASLR=1
make $jobArgs
# multi-job takes too much memory
make
#build notify gate tool
gcc -o tg-notify-gate $sourceDir/Telegram/SourceFiles/platform/haiku/notifications_haiku_gate.cpp -lbe