diff options
| author | fanquake <fanquake@gmail.com> | 2022-02-17 16:16:52 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-04-03 19:36:17 +0100 |
| commit | 7b00595d335915dc2bf856e3569115996381a402 (patch) | |
| tree | 3e7182d8114ea2b2c665e2f64071c436ef40320c /build-aux | |
| parent | 3e2ef23c3e838acbc2cba7d26a36a4c6008faa24 (diff) | |
| download | bitcoin-7b00595d335915dc2bf856e3569115996381a402.tar.xz | |
build: stop overriding user CXXFLAGS
Let users have the final say in regards to CXXFLAGS.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index e50cb55ca7..a716cd9a27 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -117,7 +117,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ TEMP_CPPFLAGS=$CPPFLAGS TEMP_CXXFLAGS=$CXXFLAGS CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS" - CXXFLAGS="$PIC_FLAGS $CXXFLAGS" + CXXFLAGS="$PIC_FLAGS $CORE_CXXFLAGS $CXXFLAGS" _BITCOIN_QT_IS_STATIC if test "$bitcoin_cv_static_qt" = "yes"; then _BITCOIN_QT_CHECK_STATIC_LIBS @@ -179,7 +179,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ TEMP_CPPFLAGS=$CPPFLAGS TEMP_CXXFLAGS=$CXXFLAGS CPPFLAGS="$QT_INCLUDES $CORE_CPPFLAGS $CPPFLAGS" - CXXFLAGS="$PIE_FLAGS $CXXFLAGS" + CXXFLAGS="$PIE_FLAGS $CORE_CXXFLAGS $CXXFLAGS" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <QtCore/qconfig.h> #ifndef QT_VERSION |