1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf
index 7bd074f..faaa26d 100644
--- a/mkspecs/reliant-cds/qmake.conf
+++ b/mkspecs/reliant-cds/qmake.conf
@@ -10,24 +10,24 @@ CONFIG			+= qt warn_on release
        QMAKE_CC        = cc
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    =
+        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_DEPS= -M
        QMAKE_CFLAGS_WARN_ON= -v
        QMAKE_CFLAGS_WARN_OFF= -w
        QMAKE_CFLAGS_RELEASE= -O
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -KPIC
        QMAKE_CFLAGS_YACC=
        QMAKE_CFLAGS_THREAD= -K pthread
        QMAKE_CXX       = CC
-        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS
+        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
@@ -42,13 +42,13 @@ QMAKE_INCDIR_QT		= $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL=
        QMAKE_LIBDIR_OPENGL=
        QMAKE_LINK      = CC
        QMAKE_LINK_SHLIB= CC
-        QMAKE_LFLAGS    =
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB= -G
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
        QMAKE_LFLAGS_THREAD= -K pthread

diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf index 7bd074f..faaa26d 100644 --- a/mkspecs/reliant-cds/qmake.conf +++ b/mkspecs/reliant-cds/qmake.conf
@@ -10,24 +10,24 @@ CONFIG += qt warn_on release
10		10
11	QMAKE_CC = cc	11	QMAKE_CC = cc
12	QMAKE_LEX = flex	12	QMAKE_LEX = flex
13	QMAKE_LEXFLAGS =	13	QMAKE_LEXFLAGS =
14	QMAKE_YACC = yacc	14	QMAKE_YACC = yacc
15	QMAKE_YACCFLAGS = -d	15	QMAKE_YACCFLAGS = -d
16	QMAKE_CFLAGS =	16	QMAKE_CFLAGS = $(CFLAGS_EXTRA)
17	QMAKE_CFLAGS_DEPS= -M	17	QMAKE_CFLAGS_DEPS= -M
18	QMAKE_CFLAGS_WARN_ON= -v	18	QMAKE_CFLAGS_WARN_ON= -v
19	QMAKE_CFLAGS_WARN_OFF= -w	19	QMAKE_CFLAGS_WARN_OFF= -w
20	QMAKE_CFLAGS_RELEASE= -O	20	QMAKE_CFLAGS_RELEASE= -O
21	QMAKE_CFLAGS_DEBUG= -g	21	QMAKE_CFLAGS_DEBUG= -g
22	QMAKE_CFLAGS_SHLIB= -KPIC	22	QMAKE_CFLAGS_SHLIB= -KPIC
23	QMAKE_CFLAGS_YACC=	23	QMAKE_CFLAGS_YACC=
24	QMAKE_CFLAGS_THREAD= -K pthread	24	QMAKE_CFLAGS_THREAD= -K pthread
25		25
26	QMAKE_CXX = CC	26	QMAKE_CXX = CC
27	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS	27	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
28	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	28	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
29	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	29	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
30	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	30	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
31	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	31	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
32	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	32	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
33	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	33	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
@@ -42,13 +42,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include
42	QMAKE_LIBDIR_QT = $(QTDIR)/lib	42	QMAKE_LIBDIR_QT = $(QTDIR)/lib
43	QMAKE_INCDIR_OPENGL=	43	QMAKE_INCDIR_OPENGL=
44	QMAKE_LIBDIR_OPENGL=	44	QMAKE_LIBDIR_OPENGL=
45		45
46	QMAKE_LINK = CC	46	QMAKE_LINK = CC
47	QMAKE_LINK_SHLIB= CC	47	QMAKE_LINK_SHLIB= CC
48	QMAKE_LFLAGS =	48	QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49	QMAKE_LFLAGS_RELEASE=	49	QMAKE_LFLAGS_RELEASE=
50	QMAKE_LFLAGS_DEBUG=	50	QMAKE_LFLAGS_DEBUG=
51	QMAKE_LFLAGS_SHLIB= -G	51	QMAKE_LFLAGS_SHLIB= -G
52	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB	52	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53	QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE	53	QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
54	QMAKE_LFLAGS_THREAD= -K pthread	54	QMAKE_LFLAGS_THREAD= -K pthread