From 7074170f69fdf8b4d41954ab42d48fea971293b3 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Fri, 9 Apr 2021 20:15:04 +0200
Subject: Respect *FLAGS environment variables.

This initializes QMAKE_CFLAGS, QMAKE_CXXFLAGS and QMAKE_LFLAGS with the
corresponding environment variables on all OSs. The variables will be
expanded when qmake is run[1].

This is a generalization of #171.

[1] <https://doc.qt.io/archives/qt-4.8/qmake-advanced-usage.html#variables>
---
 src/kristall.pro | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/kristall.pro b/src/kristall.pro
index 1bef7b3..e286d71 100644
--- a/src/kristall.pro
+++ b/src/kristall.pro
@@ -21,15 +21,11 @@ DEFINES += KRISTALL_VERSION="\"$(shell cd $$PWD; git describe --tags)\""
 # We need iconv on non-linux platforms
 !linux: LIBS += -liconv
 
-# On linux systems that have dpkg, append build flags for hardening
-linux {
-    system("which dpkg-buildflags") {
-        QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
-        QMAKE_CFLAGS   *= $(shell dpkg-buildflags --get CFLAGS)
-        QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
-        QMAKE_LFLAGS   *= $(shell dpkg-buildflags --get LDFLAGS)
-    }
-}
+# Initialize build flags from environment variables.
+QMAKE_CFLAGS   *= $$(CFLAGS)
+QMAKE_CXXFLAGS *= $$(CXXFLAGS)
+QMAKE_CPPFLAGS *= $$(CPPFLAGS)
+QMAKE_LFLAGS   *= $$(LDFLAGS)
 
 QMAKE_CFLAGS += -Wno-unused-parameter -Werror=return-type
 QMAKE_CXXFLAGS += -Wno-unused-parameter -Werror=return-type
-- 
cgit v1.2.3