[gnome-build-meta/nanonyme/local-flags] Local flags overriding based on what freedesktop-sdk has
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/nanonyme/local-flags] Local flags overriding based on what freedesktop-sdk has
- Date: Thu, 28 May 2020 19:56:06 +0000 (UTC)
commit bd6a7b36d1e650a3e3957572f99e6558f4e8b629
Author: Seppo Yli-Olli <seppo yliolli gmail com>
Date: Thu May 28 21:51:27 2020 +0300
Local flags overriding based on what freedesktop-sdk has
project.conf | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/project.conf b/project.conf
index b3eee880..990462ef 100644
--- a/project.conf
+++ b/project.conf
@@ -87,7 +87,7 @@ environment:
CXXFLAGS: "%{flags_i686}"
LDFLAGS: "%{ldflags_defaults}"
- arch == "arm":
- CFLAGS: "%{flags_arm}"
+ CFLAGS: "%{flags_arm} %{local_flags}"
CXXFLAGS: "%{flags_arm}"
LDFLAGS: "%{ldflags_defaults}"
- arch == "aarch64":
@@ -219,11 +219,12 @@ variables:
indep-libdir: "%{prefix}/lib"
debugdir: "%{indep-libdir}/debug"
common_flags: "-O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions
-fstack-protector-strong -grecord-gcc-switches"
- flags_x86_64: "-march=x86-64 -mtune=generic %{common_flags} -fasynchronous-unwind-tables
-fstack-clash-protection -fcf-protection"
- flags_i686: "-march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign %{common_flags}
-fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection"
- flags_aarch64: "%{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection"
- flags_arm: "%{common_flags}"
+ flags_x86_64: "-march=x86-64 -mtune=generic %{common_flags} -fasynchronous-unwind-tables
-fstack-clash-protection -fcf-protection %{local_flags}"
+ flags_i686: "-march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign %{common_flags}
-fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection %{local_flags}"
+ flags_aarch64: "%{common_flags} -fasynchronous-unwind-tables -fstack-clash-protection %{local_flags}"
+ flags_arm: "%{common_flags} %{local_flags}"
ldflags_defaults: "-Wl,-z,relro,-z,now -Wl,--as-needed -L%{libdir}"
+ local_flags: ''
(?):
- arch == "i686":
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]