From 8a16a2323eae29e3826f1a4d584e4a0519654e09 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 27 May 2016 18:07:28 +0200 Subject: [PATCH] Don't hardcode g++ in the toolchain settings Although it's already quite ugly that we overwrite QMAKE_CC like this, hardcoding 'g++' can break the build where prefixed versions of the toolchain are expected and where QMAKE_CXX is already properly defined. So we just use QMAKE_CXX variable here. This fixes build failures on some distributions, e.g. https://galileo.mailstation.de/jenkins/job/lipidity/36/console --- src/libbitdht.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libbitdht.pro b/src/libbitdht.pro index a525159..738deea 100644 --- a/src/libbitdht.pro +++ b/src/libbitdht.pro @@ -29,7 +29,7 @@ debug { ################################# Linux ########################################## linux-* { - QMAKE_CC = g++ + QMAKE_CC = $${QMAKE_CXX} } linux-g++ { @@ -64,7 +64,7 @@ win32-x-g++ { ################################# Windows ########################################## win32 { - QMAKE_CC = g++ + QMAKE_CC = $${QMAKE_CXX} OBJECTS_DIR = temp/obj MOC_DIR = temp/moc DEFINES *= STATICLIB WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T @@ -89,7 +89,7 @@ win32 { ################################# MacOSX ########################################## mac { - QMAKE_CC = g++ + QMAKE_CC = $${QMAKE_CXX} OBJECTS_DIR = temp/obj MOC_DIR = temp/moc }