diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-02 14:23:04 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-11-02 14:26:30 (GMT) |
| commit | a969cc4375186a6875ef450f042dad77f62ee3a8 (patch) | |
| tree | 7f932b991e5ebd831b43b5c3e298bd0f09bb2e18 /mkspecs/common | |
| parent | 0956624f7f20665fa4b789654a022a97cdda90c9 (diff) | |
| download | Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.zip Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.tar.gz Qt-a969cc4375186a6875ef450f042dad77f62ee3a8.tar.bz2 | |
Don't use scopes in mkspecs as configure does not support them
Configure has very basic parsing of mkspecs where it traverses
includes, but assumes that the last seen value is the right one.
Since this parsing does not take scopes into account we can't
use tricks like isEmpty().
Reviewed-by: ossi
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/clang.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/gcc-base.conf | 5 | ||||
| -rw-r--r-- | mkspecs/common/llvm.conf | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf index f8ab0fe..069cdfa 100644 --- a/mkspecs/common/clang.conf +++ b/mkspecs/common/clang.conf @@ -5,6 +5,9 @@ QMAKE_CC = clang QMAKE_CXX = clang++ +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX + CONFIG += clang_pch_style QMAKE_PCH_OUTPUT_EXT = .pch diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 2d8a02f..5ba0c31 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -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 diff --git a/mkspecs/common/llvm.conf b/mkspecs/common/llvm.conf index 3d66357..86e0ab4 100644 --- a/mkspecs/common/llvm.conf +++ b/mkspecs/common/llvm.conf @@ -5,6 +5,9 @@ QMAKE_CC = llvm-gcc QMAKE_CXX = llvm-g++ +QMAKE_LINK = $$QMAKE_CXX +QMAKE_LINK_SHLIB = $$QMAKE_CXX + QMAKE_PCH_OUTPUT_EXT = .gch QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} |