diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-16 10:01:11 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-16 10:01:20 +0100 |
commit | 918ea16dc08d0c612e1774387c5f0494fe51d7d5 (patch) | |
tree | 3a100fbd47f4848f86983f0c147aee0dd57c6117 | |
parent | 6eeac6e30d65f9a972067c1ea8c49978c8e631ac (diff) | |
parent | 70266e98292bf9c8f019ca4b11d681b575f71448 (diff) | |
download | bitcoin-918ea16dc08d0c612e1774387c5f0494fe51d7d5.tar.xz |
Merge #9169: build: fix qt5.7 build under macOS
70266e9 build: fix qt5.7 build under macOS (Cory Fields)
-rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 705327e816..7347277a56 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,6 @@ else CXXFLAGS_overridden=no fi AC_PROG_CXX -m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX]) dnl By default, libtool for mingw refuses to link static libs into a dll for dnl fear of mixing pic/non-pic objects, and import/export complications. Since @@ -60,6 +59,15 @@ AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) dnl Check if -latomic is required for <std::atomic> CHECK_ATOMIC +dnl Unless the user specified OBJCXX, force it to be the same as CXX. This ensures +dnl that we get the same -std flags for both. +m4_ifdef([AC_PROG_OBJCXX],[ +if test "x${OBJCXX+set}" = "x"; then + OBJCXX="${CXX}" +fi +AC_PROG_OBJCXX +]) + dnl Libtool init checks. LT_INIT([pic-only]) |