The_Great_Archive/BitDHT
1
0
Fork 0
mirror of https://github.com/RetroShare/BitDHT.git synced 2026-09-12 19:50:02 +05:00
Code Issues Packages Projects Releases Wiki Activity

Don't hardcode g++ in the toolchain settings

Browse Source 
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
This commit is contained in:
Julian Ospald 2016-05-27 18:07:28 +02:00
parent 010e1b278b
commit 8a16a2323e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libbitdht.pro
View File

@ -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
}