mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 02:36:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use CC, CXX from environment when available

Browse source
This commit is contained in:
Chocobo1 2018-12-08 13:05:05 +08:00
parent a137f1493e
commit 2a428ffd37
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf.pri.in
View file

@ -5,6 +5,8 @@ BINDIR = @EXPAND_BINDIR@
DATADIR = @EXPAND_DATADIR@ DATADIR = @EXPAND_DATADIR@
MANPREFIX = @EXPAND_MANDIR@ MANPREFIX = @EXPAND_MANDIR@
QMAKE_CC = @QBT_CC@
QMAKE_CXX = @QBT_CXX@
QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@ QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@ EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@

8
configure vendored
View file

@ -595,6 +595,8 @@ QBT_REMOVE_CONFIG
QBT_ADD_CONFIG QBT_ADD_CONFIG
QBT_CONF_EXTRA_CFLAGS QBT_CONF_EXTRA_CFLAGS
QBT_CONF_INCLUDES QBT_CONF_INCLUDES
QBT_CXX
QBT_CC
EXPAND_MANDIR EXPAND_MANDIR
EXPAND_DATADIR EXPAND_DATADIR
EXPAND_BINDIR EXPAND_BINDIR
@ -4178,6 +4180,10 @@ END
fi fi
# use compiler from env variables if available
QBT_CC="$CC"
QBT_CXX="$CXX"
# Define --wth-* and --enable-* arguments # Define --wth-* and --enable-* arguments
@ -5795,6 +5801,8 @@ QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
ac_config_files="$ac_config_files conf.pri" ac_config_files="$ac_config_files conf.pri"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF

6
configure.ac
View file

@ -8,6 +8,10 @@ AC_LANG(C++)
AC_CANONICAL_HOST AC_CANONICAL_HOST
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
# use compiler from env variables if available
QBT_CC="$CC"
QBT_CXX="$CXX"
# Define --wth-* and --enable-* arguments # Define --wth-* and --enable-* arguments
AC_ARG_WITH(qtsingleapplication, AC_ARG_WITH(qtsingleapplication,
@ -275,6 +279,8 @@ extract "$CFLAGS $CXXFLAGS"
QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES" QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
# Substitute the values of these vars in conf.pri.in # Substitute the values of these vars in conf.pri.in
AC_SUBST(QBT_CC)
AC_SUBST(QBT_CXX)
AC_SUBST(QBT_CONF_INCLUDES) AC_SUBST(QBT_CONF_INCLUDES)
AC_SUBST(QBT_CONF_EXTRA_CFLAGS) AC_SUBST(QBT_CONF_EXTRA_CFLAGS)
AC_SUBST(QBT_ADD_CONFIG) AC_SUBST(QBT_ADD_CONFIG)