1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index 17b26b0..33fda82 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -28,24 +28,24 @@ CONFIG			+= qt warn_on release
        QMAKE_CC        = cc
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
+        QMAKE_CFLAGS    = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(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
@@ -60,13 +60,13 @@ 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    = -xarch=v9
+        QMAKE_LFLAGS    = -xarch=v9 $(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

diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 17b26b0..33fda82 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -28,24 +28,24 @@ CONFIG += qt warn_on release
28		28
29	QMAKE_CC = cc	29	QMAKE_CC = cc
30	QMAKE_LEX = flex	30	QMAKE_LEX = flex
31	QMAKE_LEXFLAGS =	31	QMAKE_LEXFLAGS =
32	QMAKE_YACC = yacc	32	QMAKE_YACC = yacc
33	QMAKE_YACCFLAGS = -d	33	QMAKE_YACCFLAGS = -d
34	QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__	34	QMAKE_CFLAGS = -xarch=v9 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ $(CFLAGS_EXTRA)
35	QMAKE_CFLAGS_DEPS= -xM	35	QMAKE_CFLAGS_DEPS= -xM
36	QMAKE_CFLAGS_WARN_ON=	36	QMAKE_CFLAGS_WARN_ON=
37	QMAKE_CFLAGS_WARN_OFF= -w	37	QMAKE_CFLAGS_WARN_OFF= -w
38	QMAKE_CFLAGS_RELEASE= -O	38	QMAKE_CFLAGS_RELEASE= -O
39	QMAKE_CFLAGS_DEBUG= -g	39	QMAKE_CFLAGS_DEBUG= -g
40	QMAKE_CFLAGS_SHLIB= -KPIC	40	QMAKE_CFLAGS_SHLIB= -KPIC
41	QMAKE_CFLAGS_YACC=	41	QMAKE_CFLAGS_YACC=
42	QMAKE_CFLAGS_THREAD= -mt	42	QMAKE_CFLAGS_THREAD= -mt
43		43
44	QMAKE_CXX = CC	44	QMAKE_CXX = CC
45	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS	45	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
46	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	46	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
47	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	47	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
48	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	48	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
49	QMAKE_CXXFLAGS_RELEASE= -O2	49	QMAKE_CXXFLAGS_RELEASE= -O2
50	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	50	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
51	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	51	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
@@ -60,13 +60,13 @@ QMAKE_INCDIR_QT = $(QTDIR)/include
60	QMAKE_LIBDIR_QT = $(QTDIR)/lib	60	QMAKE_LIBDIR_QT = $(QTDIR)/lib
61	QMAKE_INCDIR_OPENGL= /usr/openwin/include	61	QMAKE_INCDIR_OPENGL= /usr/openwin/include
62	QMAKE_LIBDIR_OPENGL= /usr/openwin/lib	62	QMAKE_LIBDIR_OPENGL= /usr/openwin/lib
63		63
64	QMAKE_LINK = CC	64	QMAKE_LINK = CC
65	QMAKE_LINK_SHLIB= CC	65	QMAKE_LINK_SHLIB= CC
66	QMAKE_LFLAGS = -xarch=v9	66	QMAKE_LFLAGS = -xarch=v9 $(LFLAGS_EXTRA)
67	QMAKE_LFLAGS_RELEASE=	67	QMAKE_LFLAGS_RELEASE=
68	QMAKE_LFLAGS_DEBUG=	68	QMAKE_LFLAGS_DEBUG=
69	QMAKE_LFLAGS_SHLIB= -G	69	QMAKE_LFLAGS_SHLIB= -G
70	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB	70	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
71	QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE	71	QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
72	QMAKE_LFLAGS_THREAD= -mt	72	QMAKE_LFLAGS_THREAD= -mt