Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment

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