From dd1bdd3f8110a74306538ad5c952769f82adf6ba Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 15 Jul 2017 21:59:31 -0700 Subject: build.sh: don't fail if we can't find libusb or hidapi Also remove a left behind debug printout. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 72d8542b3..7701b9c60 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -230,9 +230,8 @@ if [[ $PLATFORM = Darwin || "$LIBGIT" < "24" ]] ; then # we are getting libusb and hidapi from pkg-config and that goes wrong # or more specifically, the way libdivecomputer references # the include files goes wrong - LIBDC_CFLAGS=-I$(dirname $(pkg-config --cflags libusb-1.0 | sed -e 's/^-I//')) - LIBDC_CFLAGS="${LIBDC_CFLAGS} -I$(dirname $(pkg-config --cflags hidapi | sed -e 's/^-I//'))" - echo $LIBDC_CFLAGS + pkg-config --exists libusb-1.0 && LIBDC_CFLAGS=-I$(dirname $(pkg-config --cflags libusb-1.0 | sed -e 's/^-I//')) + pkg-config --exists hidapi && LIBDC_CFLAGS="${LIBDC_CFLAGS} -I$(dirname $(pkg-config --cflags hidapi | sed -e 's/^-I//'))" fi LIBGIT_ARGS=" -DLIBGIT2_INCLUDE_DIR=$INSTALL_ROOT/include -DLIBGIT2_LIBRARIES=$INSTALL_ROOT/lib/libgit2.$SH_LIB_EXT " -- cgit v1.2.3-70-g09d2