Commit 2bdd8830255c0cd879572adb7272f9b5939acdb7
1 parent
d8278a90
Exists in
develop
Using MSYSTEM_CARCH to identify architecture.
Showing
1 changed file
with
2 additions
and
4 deletions
Show diff stats
win/ci-build.sh
| ... | ... | @@ -7,8 +7,6 @@ |
| 7 | 7 | # |
| 8 | 8 | echo "Running ${0}" |
| 9 | 9 | |
| 10 | -TARGET_ARCH="x86_64" | |
| 11 | - | |
| 12 | 10 | LOGFILE=build.log |
| 13 | 11 | rm -f ${LOGFILE} |
| 14 | 12 | |
| ... | ... | @@ -28,7 +26,7 @@ rm -fr ${myDIR}/.build |
| 28 | 26 | # Unpack lib3270 |
| 29 | 27 | # |
| 30 | 28 | echo "Unpacking lib3270" |
| 31 | -tar -C / -Jxf mingw-lib3270.${TARGET_ARCH}.tar.xz > $LOGFILE 2>&1 || die "lib3270 unpack failure" | |
| 29 | +tar -C / -Jxf mingw-lib3270.${MSYSTEM_CARCH}.tar.xz > $LOGFILE 2>&1 || die "lib3270 unpack failure" | |
| 32 | 30 | |
| 33 | 31 | # |
| 34 | 32 | # Build libv3270 |
| ... | ... | @@ -41,7 +39,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure" |
| 41 | 39 | make all > $LOGFILE 2>&1 || die "Make failure" |
| 42 | 40 | |
| 43 | 41 | make DESTDIR=.bin/package install || die "Install failure" |
| 44 | -tar --create --xz --file=mingw-libv3270.${TARGET_ARCH}.tar.xz --directory=.bin/package --verbose . || die "Tar failure" | |
| 42 | +tar --create --xz --file=mingw-libv3270.${MSYSTEM_CARCH}.tar.xz --directory=.bin/package --verbose . || die "Tar failure" | |
| 45 | 43 | |
| 46 | 44 | |
| 47 | 45 | echo "Build complete" | ... | ... |