Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use CC, CXX from environment when available
  • Loading branch information
Chocobo1 committed Dec 8, 2018
1 parent a137f14 commit 2a428ff
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
2 changes: 2 additions & 0 deletions conf.pri.in
Expand Up @@ -5,6 +5,8 @@ BINDIR = @EXPAND_BINDIR@
DATADIR = @EXPAND_DATADIR@
MANPREFIX = @EXPAND_MANDIR@

QMAKE_CC = @QBT_CC@
QMAKE_CXX = @QBT_CXX@
QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@

EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
Expand Down
8 changes: 8 additions & 0 deletions configure
Expand Up @@ -595,6 +595,8 @@ QBT_REMOVE_CONFIG
QBT_ADD_CONFIG
QBT_CONF_EXTRA_CFLAGS
QBT_CONF_INCLUDES
QBT_CXX
QBT_CC
EXPAND_MANDIR
EXPAND_DATADIR
EXPAND_BINDIR
Expand Down Expand Up @@ -4178,6 +4180,10 @@ END
fi


# use compiler from env variables if available
QBT_CC="$CC"
QBT_CXX="$CXX"

# Define --wth-* and --enable-* arguments


Expand Down Expand Up @@ -5795,6 +5801,8 @@ QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"





ac_config_files="$ac_config_files conf.pri"

cat >confcache <<\_ACEOF
Expand Down
6 changes: 6 additions & 0 deletions configure.ac
Expand Up @@ -8,6 +8,10 @@ AC_LANG(C++)
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE

# use compiler from env variables if available
QBT_CC="$CC"
QBT_CXX="$CXX"

# Define --wth-* and --enable-* arguments

AC_ARG_WITH(qtsingleapplication,
Expand Down Expand Up @@ -275,6 +279,8 @@ extract "$CFLAGS $CXXFLAGS"
QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"

# 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_EXTRA_CFLAGS)
AC_SUBST(QBT_ADD_CONFIG)
Expand Down

0 comments on commit 2a428ff

Please sign in to comment.