para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert all since "Workaround: fallback to mscv link.exe" did not work on AppVeyor

Browse Source 
This reverts the commits:
bda3d6a428
97062933ac
0f4fb04bac
1b0c19afd1
a5739ea5f0
This commit is contained in:
Roelf-Jilling 2018-11-16 17:34:14 +01:00
parent bda3d6a428
commit a7ec3a85ab
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
appveyor.yml
View File

@ -18,8 +18,8 @@ environment:
# USE_TOOLSET: MSVC # USE_TOOLSET: MSVC
#- GSL_CXX_STANDARD: 17 #- GSL_CXX_STANDARD: 17
# USE_TOOLSET: MSVC # USE_TOOLSET: MSVC
#- GSL_CXX_STANDARD: 14 - GSL_CXX_STANDARD: 14
# USE_TOOLSET: LLVM USE_TOOLSET: LLVM
- GSL_CXX_STANDARD: 17 - GSL_CXX_STANDARD: 17
USE_TOOLSET: LLVM USE_TOOLSET: LLVM
@ -32,6 +32,7 @@ matrix:
cache: cache:
- C:\cmake-3.8.0-win32-x86 - C:\cmake-3.8.0-win32-x86
- C:\Tools\vcpkg
install: install:
- ps: | - ps: |
@ -42,6 +43,15 @@ install:
} }
$env:PATH="C:\cmake-3.8.0-win32-x86\bin;$env:PATH" $env:PATH="C:\cmake-3.8.0-win32-x86\bin;$env:PATH"
} }
# Until vcpkg has been updated.
# Note: vcpkg can also be removed from "cache".
if ($env:USE_TOOLSET -eq "LLVM" -and
(Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020
) {
cd C:\Tools\vcpkg
git pull
cd "$env:APPVEYOR_BUILD_FOLDER"
}
before_build: before_build:
- ps: | - ps: |
@ -57,19 +67,8 @@ before_build:
} }
echo generator="$env:generator" echo generator="$env:generator"
if ($env:USE_TOOLSET -eq "LLVM") { if ($env:USE_TOOLSET -eq "LLVM") {
$COMPILER = "C:\\Program Files\\LLVM\\bin\\clang-cl.exe"
$LINKER = "lld-link"
# Workaround for lld bug with vcpkg integration
if ((Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020) {
echo "Fallback to MSVC linker."
cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% && PATH > path.txt'
$env:PATH = (Get-Content .\path.txt).Remove(0,5) # "PATH="
$LINKER = "link.exe"
} else { echo "==> vcpkg has been updated, please remove the workaround from appvayor.yml." }
# /Workaround
clang-cl --version clang-cl --version
echo $env:PATH cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_LINKER=lld-link
cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER="$COMPILER" -DCMAKE_LINKER="$LINKER"
} }
else { else {
cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD"