Merge PR #3034: Backport PR #3033 to 1.2.x: compiler.pri: add CONFIG(…

…dpkg-buildflags).
mumble-voip · Apr 17, 2017 · 5e4a214 · 5e4a214
2 parents cf8eaa2 + 9993bba
commit 5e4a214
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/INSTALL b/INSTALL
@@ -157,3 +157,7 @@ CONFIG+=no-xinput2 (Mumble, Linux)
 CONFIG+=no-xboxinput (Mumble, Win32)
  Don't build in support for global shortcuts
  from Xbox controllers via the XInput DLL.
+
+CONFIG+=dpkg-buildflags
+ Add CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS
+ from dpkg-buildflags to Mumble's build flags.
diff --git a/compiler.pri b/compiler.pri
@@ -111,6 +111,14 @@ unix {
 }
 
 unix:!macx {
+	CONFIG(dpkg-buildflags) {
+		QMAKE_CFLAGS *= $$system(dpkg-buildflags --get CFLAGS)
+		QMAKE_CXXFLAGS *= $$system(dpkg-buildflags --get CXXFLAGS)
+		QMAKE_CPPFLAGS *= $$system(dpkg-buildflags --get CPPFLAGS)
+		QMAKE_LFLAGS *= $$system(dpkg-buildflags --get LDFLAGS)
+	}
+
+
 	CONFIG(debug, debug|release) {
 		QMAKE_CFLAGS *= -fstack-protector -fPIE -pie
 		QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie