1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index 0aa1097..3d50180 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -9,28 +9,28 @@ MAKEFILE_GENERATOR	= UNIX
        TEMPLATE        = app
        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= -xM
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF= -w
        QMAKE_CFLAGS_RELEASE= -O
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -KPIC
        QMAKE_CFLAGS_YACC=
        QMAKE_CFLAGS_THREAD= -mt
        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= -O2
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
        QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
        QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
@@ -41,17 +41,17 @@ QMAKE_INCDIR_X11	= /usr/openwin/include
        QMAKE_LIBDIR_X11= /usr/openwin/lib
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= /usr/openwin/include
        QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
        QMAKE_LINK      = CC
        QMAKE_LINK_SHLIB= CC
-        QMAKE_LFLAGS    = -R$(QTDIR)/lib
+        QMAKE_LFLAGS    = -R$(QTDIR)/lib $(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= -mt
        QMAKE_RPATH     = -R

diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index 0aa1097..3d50180 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf
@@ -9,28 +9,28 @@ MAKEFILE_GENERATOR = UNIX
9	TEMPLATE = app	9	TEMPLATE = app
10	CONFIG += qt warn_on release	10	CONFIG += qt warn_on release
11		11
12	QMAKE_CC = cc	12	QMAKE_CC = cc
13	QMAKE_LEX = flex	13	QMAKE_LEX = flex
14	QMAKE_LEXFLAGS =	14	QMAKE_LEXFLAGS =
15	QMAKE_YACC = yacc	15	QMAKE_YACC = yacc
16	QMAKE_YACCFLAGS = -d	16	QMAKE_YACCFLAGS = -d
17	QMAKE_CFLAGS =	17	QMAKE_CFLAGS = $(CFLAGS_EXTRA)
18	QMAKE_CFLAGS_DEPS= -xM	18	QMAKE_CFLAGS_DEPS= -xM
19	QMAKE_CFLAGS_WARN_ON=	19	QMAKE_CFLAGS_WARN_ON=
20	QMAKE_CFLAGS_WARN_OFF= -w	20	QMAKE_CFLAGS_WARN_OFF= -w
21	QMAKE_CFLAGS_RELEASE= -O	21	QMAKE_CFLAGS_RELEASE= -O
22	QMAKE_CFLAGS_DEBUG= -g	22	QMAKE_CFLAGS_DEBUG= -g
23	QMAKE_CFLAGS_SHLIB= -KPIC	23	QMAKE_CFLAGS_SHLIB= -KPIC
24	QMAKE_CFLAGS_YACC=	24	QMAKE_CFLAGS_YACC=
25	QMAKE_CFLAGS_THREAD= -mt	25	QMAKE_CFLAGS_THREAD= -mt
26		26
27	QMAKE_CXX = CC	27	QMAKE_CXX = CC
28	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS	28	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
29	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	29	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
30	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	30	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
31	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	31	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
32	QMAKE_CXXFLAGS_RELEASE= -O2	32	QMAKE_CXXFLAGS_RELEASE= -O2
33	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	33	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
34	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	34	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
35	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	35	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
36	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	36	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
@@ -41,17 +41,17 @@ QMAKE_INCDIR_X11 = /usr/openwin/include
41	QMAKE_LIBDIR_X11= /usr/openwin/lib	41	QMAKE_LIBDIR_X11= /usr/openwin/lib
42	QMAKE_INCDIR_QT = $(QTDIR)/include	42	QMAKE_INCDIR_QT = $(QTDIR)/include
43	QMAKE_LIBDIR_QT = $(QTDIR)/lib	43	QMAKE_LIBDIR_QT = $(QTDIR)/lib
44	QMAKE_INCDIR_OPENGL= /usr/openwin/include	44	QMAKE_INCDIR_OPENGL= /usr/openwin/include
45	QMAKE_LIBDIR_OPENGL= /usr/openwin/lib	45	QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
46		46
47	QMAKE_LINK = CC	47	QMAKE_LINK = CC
48	QMAKE_LINK_SHLIB= CC	48	QMAKE_LINK_SHLIB= CC
49	QMAKE_LFLAGS = -R$(QTDIR)/lib	49	QMAKE_LFLAGS = -R$(QTDIR)/lib $(LFLAGS_EXTRA)
50	QMAKE_LFLAGS_RELEASE=	50	QMAKE_LFLAGS_RELEASE=
51	QMAKE_LFLAGS_DEBUG=	51	QMAKE_LFLAGS_DEBUG=
52	QMAKE_LFLAGS_SHLIB= -G	52	QMAKE_LFLAGS_SHLIB= -G
53	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB	53	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
54	QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE	54	QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
55	QMAKE_LFLAGS_THREAD= -mt	55	QMAKE_LFLAGS_THREAD= -mt
56	QMAKE_RPATH = -R	56	QMAKE_RPATH = -R
57		57