diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2015-05-23 18:50:36 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2015-05-23 18:50:36 +0200 |
commit | 0d96f74958fd20bbafe4ba457d99a802abb12a58 (patch) | |
tree | 6dc4f90663631c0d56b90a329c42f3f54644d6b2 | |
parent | 538d6a2440fbe645b970402fa7e86dfd3e36192b (diff) | |
download | qt3-0d96f74958fd20bbafe4ba457d99a802abb12a58.tar.gz qt3-0d96f74958fd20bbafe4ba457d99a802abb12a58.zip |
Update buildkey for GCC 5
[taken from RedHat Qt3 patches]
-rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2810,7 +2810,7 @@ case "$COMPILER" in g++*) # GNU C++ QMAKE_CONF_COMPILER=`grep "QMAKE_CXX[^_A-Z0-9a-z]" $QMAKESPEC/qmake.conf | sed "s,.* *= *\(.*\)$,\1,"` - COMPILER_VERSION=`${QMAKE_CONF_COMPILER} --version 2>/dev/null | sed 's,^[^0-9]*,,g'` + COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null | sed 's,^[^0-9]*,,g'` case "$COMPILER_VERSION" in 2.95.*) COMPILER_VERSION="2.95.*" @@ -2818,7 +2818,7 @@ g++*) 3.*) COMPILER_VERSION="3.*" ;; - 4.*) + 5.*|4.*) COMPILER_VERSION="4.*" ;; *) |