JMR-dev/redshift-rebooted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Appveyor: Change to use MSYSTEM with MSYS to get correct MinGW tools

Browse Source 
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.
This commit is contained in:
Jon Lund Steffensen
2017-07-30 15:33:53 -07:00
parent 930225ff2b
commit 944bd07956
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
appveyor.yml
+14 -13
View File
@@ -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: |