epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

travis: fix RTEMS cross builds for Base 3.15

Browse Source
This commit is contained in:
Ralph Lange
2020-04-24 19:12:20 +02:00
parent 1ac8bf7479
commit 48b15417a6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
travis/build.sh
View File

@@ -13,6 +13,9 @@ export EPICS_BASE
[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl)
export EPICS_HOST_ARCH
# Base 3.15 doesn't have -qemu target architecture and needs an extra define
[ -e $EPICS_BASE/configure/os/CONFIG.Common.RTEMS-pc386-qemu ] || EXTRA_QEMU=RTEMS_QEMU_FIXUPS=YES
# use array variable to get the quoting right while using separate words for arguments
[ -n "$EXTRA0" ] && EXTRA[0]="$EXTRA0"
[ -n "$EXTRA1" ] && EXTRA[1]="$EXTRA1"
@@ -21,7 +24,7 @@ export EPICS_HOST_ARCH
[ -n "$EXTRA4" ] && EXTRA[4]="$EXTRA4"
[ -n "$EXTRA5" ] && EXTRA[5]="$EXTRA5"
make -j2 "${EXTRA[@]}"
make -j2 $EXTRA_QEMU "${EXTRA[@]}"
ret=0

4
travis/prepare.sh
View File

@@ -183,8 +183,10 @@ EOF
RTEMS_VERSION=$RTEMS
RTEMS_BASE=$HOME/.rtems
EOF
# Base 3.15 doesn't have -qemu target architecture
[ -e $EPICS_BASE/configure/os/CONFIG.Common.RTEMS-pc386-qemu ] && QEMU=-qemu
cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386$QEMU
EOF
fi