From aac51b80a9bb49946b3144d47653475c2fde485f Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sun, 20 Oct 2019 11:20:22 -0700 Subject: [PATCH] preserve EPICS_HOST_ARCH If manually specified --- travis-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-prepare.sh b/travis-prepare.sh index 33acef3..6f40cca 100755 --- a/travis-prepare.sh +++ b/travis-prepare.sh @@ -57,7 +57,7 @@ then cat $CURDIR/configure/RELEASE.local fi -EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch` +[ "$EPICS_HOST_ARCH" ] || EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch` # requires wine and g++-mingw-w64-i686 if [ "$WINE" = "32" ]