diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2017-07-30 13:14:37 -0700 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2017-07-30 15:33:53 -0700 |
| commit | 944bd079565ca65880c1a98e3acd28f7886452ed (patch) | |
| tree | 3f8109f89e4a894eb3ffbd81b7bc83b9925514ae | |
| parent | Merge pull request #489 from jonls/appveyor-distcheck (diff) | |
| download | redshift-ng-944bd079565ca65880c1a98e3acd28f7886452ed.tar.gz redshift-ng-944bd079565ca65880c1a98e3acd28f7886452ed.tar.bz2 redshift-ng-944bd079565ca65880c1a98e3acd28f7886452ed.tar.xz | |
Appveyor: Change to use MSYSTEM with MSYS to get correct MinGW tools
This fixes an issue where the configure script would prefer the tools
in c:\msys64\usr\bin instead of the MinGW tools. This specifially
failed when searching for windres while cross-compiling for i686
because the tool found in c:\msys64\usr\bin would generate 64-bit
object files.
| -rw-r--r-- | appveyor.yml | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/appveyor.yml b/appveyor.yml index 045cec9..57b9cbc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,19 +10,20 @@ build: verbosity: detailed build_script: -- if [%arch%]==[x86_64] ( - SET "ADD_PATH_CMD=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin" - ) -- if [%arch%]==[i686] ( - SET "ADD_PATH_CMD=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin" - ) -- set PATH=C:\msys64\usr\bin;%ADD_PATH_CMD%;%PATH% -- set CONFIGURE_FLAGS=--disable-drm --disable-randr --disable-vidmode --enable-wingdi --disable-quartz --disable-geoclue --disable-geoclue2 --disable-corelocation --disable-gui --disable-ubuntu --disable-nls --host=%arch%-w64-mingw32 -- bash -lc "mkdir $APPVEYOR_BUILD_FOLDER/root" -- bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap" -- bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --prefix=\"$APPVEYOR_BUILD_FOLDER/root\" $CONFIGURE_FLAGS" -- bash -lc "cd $APPVEYOR_BUILD_FOLDER && make distcheck DISTCHECK_CONFIGURE_FLAGS=\"$CONFIGURE_FLAGS\"" -- bash -lc "cd $APPVEYOR_BUILD_FOLDER && make install" +- ps: | + If ($env:arch -Match "x86_64") { + $env:MSYSTEM = "MINGW64" + } Else { + $env:MSYSTEM = "MINGW32" + } + + $env:CONFIGURE_FLAGS = "--disable-drm --disable-randr --disable-vidmode --enable-wingdi --disable-quartz --disable-geoclue --disable-geoclue2 --disable-corelocation --disable-gui --disable-ubuntu --disable-nls --host=$env:arch-w64-mingw32" + +- ps: md (Join-Path $env:APPVEYOR_BUILD_FOLDER root) +- C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./bootstrap" +- C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && ./configure --prefix=\"$APPVEYOR_BUILD_FOLDER/root\" $CONFIGURE_FLAGS" +- C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && make distcheck DISTCHECK_CONFIGURE_FLAGS=\"$CONFIGURE_FLAGS\"" +- C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && make install" after_build: - ps: | |