diff options
Diffstat (limited to 'mkspecs/common/gcc-base.conf')
| -rw-r--r-- | mkspecs/common/gcc-base.conf | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 41280c6..5ba0c31 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -7,21 +7,21 @@ # # Platform-specific options shared by these compilers are put into: # -# - gcc-base-mac.conf +# - gcc-base-macx.conf # - gcc-base-unix.conf # # These base files are then combined with configurations for each compiler: # -# - g++.conf -# - g++-mac.conf +# - g++-base.conf +# - g++-macx.conf # - g++-unix.conf # - llvm.conf # - clang.conf # # The combination happens in the top level mkspec, by including a platform- -# specific version of the base-file, for example gcc-base-mac.conf, and then +# specific version of the base-file, for example gcc-base-macx.conf, and then # a (possibly platform-specific) version of the actual compiler configuration, -# for example g++-mac.conf. +# for example g++-macx.conf. # # If you are making changes to any of these files, please consider the # possible effect it may have due to these include-rules, and whether it @@ -31,8 +31,7 @@ # you can use the manual test in tests/manual/mkspecs. # -# Allow including configurations to override -isEmpty(QMAKE_CC): QMAKE_CC = gcc +QMAKE_CC = gcc QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M @@ -45,7 +44,7 @@ QMAKE_CFLAGS_STATIC_LIB += -fPIC QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden -isEmpty(QMAKE_CXX): QMAKE_CXX = g++ +QMAKE_CXX = g++ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS |