Skip to content

Commit

Permalink
Avoid mingw's default manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
krono committed Apr 28, 2017
1 parent 752be88 commit c07df4f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .appveyor.yml
Expand Up @@ -70,6 +70,10 @@ install:
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86_64.exe" -FileName "setup-x86_64.exe"'
- '%CYG_SETUP% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -P mingw64-%MINGW_ARCH%-gcc-core,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-headers,mingw64-%MINGW_ARCH%-runtime,zip,mingw64-%MINGW_ARCH%-clang,libiconv-devel,libglib2.0-devel,perl,mingw64-%MINGW_ARCH%-zlib,cmake,mingw64-%MINGW_ARCH%-win-iconv'

# Mingw has a default embedded manifest now, which is poisonous, but we cannot uninstall because the package is a hard dependency.
# Absence of the file is ok tho.
# - '%CYG_SETUP% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -x mingw64-%MINGW_ARCH%-windows-default-manifest'

build: false

# Cygwin build script
Expand Down
4 changes: 4 additions & 0 deletions .travis_build.sh
Expand Up @@ -17,6 +17,10 @@ if [[ "${APPVEYOR}" ]]; then
echo
test -d /usr/i686-w64-mingw32/sys-root/mingw/lib || echo "No lib dir"
test -d /usr/i686-w64-mingw32/sys-root/mingw/include || echo "No inc dir"

# Mingw has a default embedded manifest now, which is poisonous.
# Absence of the file is ok tho.
rm -f /usr/i686-w64-mingw32/sys-root/mingw/lib/default-manifest.o || true
else
PLATFORM="${TRAVIS_OS_NAME}"
fi
Expand Down

0 comments on commit c07df4f

Please sign in to comment.