aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2013-12-06 18:11:03 -0500
committerCory Fields <cory-nospam-@coryfields.com>2014-03-20 13:06:16 -0400
commitb62bbb1ff00bdac1e0f95943b5c53638ef53ca0e (patch)
tree4ee33215470005894a88875f98be981209f9cb8f /configure.ac
parent0f21d39ffad3425f4ffbe69513ac214434cef8f3 (diff)
build: if cross-compiling for an apple host, locate some additional tools
This should be safe to do for native builds too, but for now it's specific to cross-builds to avoid possible regressions.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 7ce5f683ee..1111575a51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,6 +222,7 @@ case $host in
TARGET_OS=darwin
LEVELDB_TARGET_FLAGS="TARGET_OS=Darwin"
if test x$cross_compiling != xyes; then
+ BUILD_OS=darwin
AC_CHECK_PROG([PORT],port, port)
if test x$PORT = xport; then
dnl add default macports paths
@@ -238,6 +239,17 @@ case $host in
CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include"
LIBS="$LIBS -L$bdb_prefix/lib"
fi
+ else
+ case $build_os in
+ *darwin*)
+ BUILD_OS=darwin
+ ;;
+ *)
+ AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
+ AC_PATH_TOOL([OTOOL], [otool], otool)
+ AC_PATH_PROGS([GENISOIMAGE], [genisoimage mkisofs],genisoimage)
+ ;;
+ esac
fi
CPPFLAGS="$CPPFLAGS -DMAC_OSX"
@@ -671,6 +683,7 @@ if test "x$use_tests$build_bitcoind$use_qt" = "xnonono"; then
fi
AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
+AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin])
AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet == xyes])
AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])