LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #9169: build: fix qt5.7 build under macOS

Browse source 
70266e9 build: fix qt5.7 build under macOS (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan 2016-11-16 10:01:11 +01:00
commit 918ea16dc0
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configure.ac
View file

@ -45,7 +45,6 @@ else
CXXFLAGS_overridden=no CXXFLAGS_overridden=no
fi fi
AC_PROG_CXX 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 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 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> dnl Check if -latomic is required for <std::atomic>
CHECK_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. dnl Libtool init checks.
LT_INIT([pic-only]) LT_INIT([pic-only])