Skip to content

Commit 9e011fc

Browse files
authored
Use Msys paths for compiler and linker
1 parent dd5cd3d commit 9e011fc

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,14 @@ before_install:
5757
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --populate msys2; fi
5858
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman-key --refresh-keys; fi
5959
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then pacman -Syuu; fi
60-
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi
60+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then echo 'all' | pacman -S --needed --noconfirm autoconf autogen automake1.16 libtool pkg-config gnutls libgcrypt libgnutls libgnutls-devel mingw-w64-x86_64-pkg-config; fi
6161
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PKG_CONFIG_PATH="/usr/lib/pkgconfig/;/usr;/usr/lib"; fi
6262
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LDFLAGS="$LDFLAGS -L/usr/lib"; fi
6363
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CFLAGS="$CFLAGS -I/usr/include"; fi
6464
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXXFLAGS="$CXXFLAGS -I/usr/include"; fi
65+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CC="/usr/bin/gcc"; fi
66+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CXX="/usr/bin/g++"; fi
67+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export LD="/usr/bin/ld"; fi
6568
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then cat /usr/include/gnutls/gnutls.h ; fi
6669
- curl https://s3.amazonaws.com/libhttpserver/libmicrohttpd_releases/libmicrohttpd-0.9.59.tar.gz -o libmicrohttpd-0.9.59.tar.gz
6770
- tar -xzf libmicrohttpd-0.9.59.tar.gz

0 commit comments

Comments
 (0)