Author: ericwf
Date: Tue May 9 21:30:16 2017
New Revision: 302614
URL: http://llvm.org/viewvc/llvm-project?rev=302614&view=rev
Log:
Add MinGW64 builder to Appveyor.
With the amount of work happening on Windows we should
have a MinGW bot to make sure we don't regress that functionality.
Currently it doesn't build :-(
Modified:
libcxx/trunk/appveyor.yml
libcxx/trunk/install-appveyor-reqs.cmd
Modified: libcxx/trunk/appveyor.yml
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/appveyor.yml?rev=302614&r1=302613&r2=302614&view=diff
==============================================================================
--- libcxx/trunk/appveyor.yml (original)
+++ libcxx/trunk/appveyor.yml Tue May 9 21:30:16 2017
@@ -11,14 +11,25 @@ configuration:
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+ CMAKE_OPTIONS: -DCMAKE_C_COMPILER=clang-cl.exe
-DCMAKE_CXX_COMPILER=clang-cl.exe
CLANG_VERSION: ToT
MSVC_SETUP_PATH: C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
MSVC_SETUP_ARG: x86
+ GENERATOR: Ninja
+ MAKE_PROGRAM: ninja
APPVEYOR_SAVE_CACHE_ON_ERROR: true
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+ CMAKE_OPTIONS: -DCMAKE_C_COMPILER=clang-cl.exe
-DCMAKE_CXX_COMPILER=clang-cl.exe
CLANG_VERSION: 4
MSVC_SETUP_PATH: C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\vcvarsall.bat
MSVC_SETUP_ARG: x86_amd64
+ GENERATOR: Ninja
+ MAKE_PROGRAM: ninja
+ APPVEYOR_SAVE_CACHE_ON_ERROR: true
+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+ MINGW_PATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin
+ GENERATOR: MinGW Makefiles
+ MAKE_PROGRAM: mingw32-make
APPVEYOR_SAVE_CACHE_ON_ERROR: true
install:
@@ -28,7 +39,7 @@ install:
- call "%APPVEYOR_BUILD_FOLDER%\\install-appveyor-reqs.cmd"
before_build:
- - call "%MSVC_SETUP_PATH%" %MSVC_SETUP_ARG%
+ - if DEFINED MSVC_SETUP_PATH call "%MSVC_SETUP_PATH%" %MSVC_SETUP_ARG%
- cd %APPVEYOR_BUILD_FOLDER%
build_script:
@@ -39,8 +50,7 @@ build_script:
#############################################################################
# Configuration Step
#############################################################################
- - cmake -G Ninja %extra_cmake_flags%
- -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_CXX_COMPILER=clang-cl.exe
+ - cmake -G "%GENERATOR%" %CMAKE_OPTIONS%
"-DCMAKE_BUILD_TYPE=%configuration%"
"-DLLVM_PATH=C:\projects\deps\llvm"
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-DLLVM_LIT_ARGS="-sv --show-xfail --show-unsupported"
@@ -49,10 +59,10 @@ build_script:
#############################################################################
# Build Step
#############################################################################
- - ninja
+ - "%MAKE_PROGRAM%"
test_script:
- - ninja check-cxx
+ - "%MAKE_PROGRAM%" check-cxx
on_failure:
- appveyor PushArtifact CMakeFiles/CMakeOutput.log
Modified: libcxx/trunk/install-appveyor-reqs.cmd
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/install-appveyor-reqs.cmd?rev=302614&r1=302613&r2=302614&view=diff
==============================================================================
--- libcxx/trunk/install-appveyor-reqs.cmd (original)
+++ libcxx/trunk/install-appveyor-reqs.cmd Tue May 9 21:30:16 2017
@@ -1,11 +1,12 @@
@echo on
+
if NOT EXIST C:\projects\deps (
mkdir C:\projects\deps
)
cd C:\projects\deps
::###########################################################################
-:: Setup the path to Clang-cl
+:: Setup Compiler
::###########################################################################
if NOT EXIST llvm-installer.exe (
appveyor DownloadFile
http://llvm.org/pre-releases/win-snapshots/LLVM-5.0.0-r301646-win32.exe
-FileName llvm-installer.exe
@@ -13,8 +14,13 @@ if NOT EXIST llvm-installer.exe (
if "%CLANG_VERSION%"=="ToT" (
START /WAIT llvm-installer.exe /S /D=C:\"Program Files\LLVM"
)
-@set PATH="C:\Program Files\LLVM\bin";%PATH%
-clang-cl -v
+if DEFINED CLANG_VERSION @set PATH="C:\Program Files\LLVM\bin";%PATH%
+if DEFINED CLANG_VERSION clang-cl -v
+
+if DEFINED MINGW_PATH rename "C:\Program Files\Git\usr\bin\sh.exe"
"sh-ignored.exe"
+if DEFINED MINGW_PATH @set "PATH=%PATH:C:\Program Files (x86)\Git\bin=%"
+if DEFINED MINGW_PATH @set "PATH=%PATH%;%MINGW_PATH%"
+if DEFINED MINGW_PATH g++ -v
::###########################################################################
:: Install a recent CMake
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
