Commit d93538cd authored by Boris Pek's avatar Boris Pek

Update add-hardening-flags-in-compiler-options.patch.

parent 50f28e69
Description: Add hardening flags in compiler options
Description: Use LDFLAGS variable from build environment
Origin: upstream, https://github.com/psi-plus/qconf/commit/851a9d9
Author: Boris Pek <tehnick-8@mail.ru>
Last-Update: 2014-01-15
Last-Update: 2016-10-20
diff --git a/qconf.pro b/qconf.pro
--- a/qconf.pro
+++ b/qconf.pro
@@ -29,3 +29,10 @@
libfiles.files = $$IN_PWD/conf $$IN_PWD/modules
INSTALLS += libfiles
@@ -16,10 +16,19 @@
}
!isEmpty(CXXFLAGS) {
+ QMAKE_CXXFLAGS = $$CXXFLAGS
QMAKE_CXXFLAGS_DEBUG = $$CXXFLAGS
QMAKE_CXXFLAGS_RELEASE = $$CXXFLAGS
}
+isEmpty(LDFLAGS) {
+ LDFLAGS=$$(LDFLAGS)
+}
+
+unix:!mac {
+ QMAKE_CXXFLAGS += $(Q_CXXFLAGS)
+ QMAKE_CFLAGS_DEBUG += $(Q_CFLAGS)
+ QMAKE_CFLAGS_RELEASE += $(Q_CFLAGS)
+ QMAKE_LFLAGS += $(Q_LDFLAGS)
+!isEmpty(LDFLAGS) {
+ QMAKE_LFLAGS = $$LDFLAGS
+}
+
!isEmpty(DATADIR) {
contains($$list($$[QT_VERSION]), 4.0.*|4.1.*) {
DEFINES += DATADIR=\"$$DATADIR\"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment