diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-04-17 15:10:42 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-04-17 15:10:42 +0300 |
| commit | e3460f67d5e809bfb2869a84647afc47833c9ad2 (patch) | |
| tree | 1becb622315a1ae3f101ef4eb7888c5bbb372d21 /qmake | |
| parent | eb63d0b14a7bc19bfdf34f80921798f0a67cdedf (diff) | |
qmake/compiler.pri: add CONFIG(dpkg-buildflags).
Shelling out to dpkg-buildflags to get the preferred build flags
is now the way to go on Debian.
Previously, our PPA packages used hardening-wrapper to pass the
proper hardening flags to the package. That package is no longer
available in Debian unstable or Ubuntu zesty. To remedy that situation,
we have to add flags ourselves via dpkg-buildflags.
This commit implements a new CONFIG flag, CONFIG(dpkg-buildflags)
which will query dpkg-buildflags and append the retrieved CFLAGS,
CXXFLAGS, CPPFLAGS and LDFLAGS to QMAKE_CFLAGS, QMAKE_CXXFLAGS,
QMAKE_CPPFLAGS, QMAKE_LDFLAGS to ensure they are used in the Mumble
build.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/compiler.pri | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/compiler.pri b/qmake/compiler.pri index 4a1b25d19..7151da491 100644 --- a/qmake/compiler.pri +++ b/qmake/compiler.pri @@ -281,6 +281,13 @@ 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 QMAKE_CXXFLAGS *= -fstack-protector -fPIE |