From aac51b80a9bb49946b3144d47653475c2fde485f Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sun, 20 Oct 2019 11:20:22 -0700 Subject: [PATCH 1/2] 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" ] From f1048da6435c41a674fb9a7e041c4396fc0ea74e Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Sun, 20 Oct 2019 11:20:33 -0700 Subject: [PATCH 2/2] mingw64 --- travis-prepare.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/travis-prepare.sh b/travis-prepare.sh index 6f40cca..f5e30fd 100755 --- a/travis-prepare.sh +++ b/travis-prepare.sh @@ -70,6 +70,17 @@ EOF cat << EOF >> epics-base/configure/CONFIG_SITE CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw EOF + +elif [ "$WINE" = "64" ] +then + echo "Cross mingw64" + sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.windows-x64-mingw + cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.windows-x64-mingw +CMPLR_PREFIX=x86_64-w64-mingw32- +EOF + cat << EOF >> epics-base/configure/CONFIG_SITE +CROSS_COMPILER_TARGET_ARCHS+=windows-x64-mingw +EOF fi if [ "$STATIC" = "YES" ]