Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-03 14:45:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 59aef8ab7b
commit ed867c52bd
No known key found for this signature in database
GPG key ID: 511B62C09D50CD28
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libbitdht/src/libbitdht.pro
View file

@ -29,7 +29,7 @@ debug {
################################# Linux ########################################## ################################# Linux ##########################################
linux-* { linux-* {
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
} }
linux-g++ { linux-g++ {
@ -64,7 +64,7 @@ win32-x-g++ {
################################# Windows ########################################## ################################# Windows ##########################################
win32 { win32 {
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc MOC_DIR = temp/moc
DEFINES *= STATICLIB WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T DEFINES *= STATICLIB WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
@ -89,7 +89,7 @@ win32 {
################################# MacOSX ########################################## ################################# MacOSX ##########################################
mac { mac {
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc MOC_DIR = temp/moc
} }

6
libretroshare/src/libretroshare.pro
View file

@ -122,7 +122,7 @@ linux-* {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64 QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
contains(CONFIG, NO_SQLCIPHER) { contains(CONFIG, NO_SQLCIPHER) {
DEFINES *= NO_SQLCIPHER DEFINES *= NO_SQLCIPHER
@ -225,7 +225,7 @@ win32-x-g++ {
################################# Windows ########################################## ################################# Windows ##########################################
win32 { win32 {
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc MOC_DIR = temp/moc
DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
@ -259,7 +259,7 @@ win32 {
################################# MacOSX ########################################## ################################# MacOSX ##########################################
mac { mac {
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc MOC_DIR = temp/moc
#DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW #DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW

6
tests/librssimulator/librssimulator.pro
View file

@ -70,7 +70,7 @@ linux-* {
DESTDIR = lib DESTDIR = lib
QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64 QMAKE_CXXFLAGS *= -Wall -D_FILE_OFFSET_BITS=64
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
SSL_DIR = /usr/include/openssl SSL_DIR = /usr/include/openssl
UPNP_DIR = /usr/include/upnp UPNP_DIR = /usr/include/upnp
@ -143,7 +143,7 @@ win32-x-g++ {
################################# Windows ########################################## ################################# Windows ##########################################
win32 { win32 {
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc MOC_DIR = temp/moc
DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
@ -188,7 +188,7 @@ win32 {
################################# MacOSX ########################################## ################################# MacOSX ##########################################
mac { mac {
QMAKE_CC = g++ QMAKE_CC = $${QMAKE_CXX}
OBJECTS_DIR = temp/obj OBJECTS_DIR = temp/obj
MOC_DIR = temp/moc MOC_DIR = temp/moc
#DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW #DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW