Skip to content

Commit 183749f

Browse files
authored
build: add a workaround symlink for 5.3 builds (#290)
This adds a symbolic link for the swiftc that is attempted to be executed due to the incorrect extension check in the build.
1 parent 42b6821 commit 183749f

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

.ci/templates/windows-sdk.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ parameters:
3636
- name: ICU_VERSION
3737
type: string
3838

39+
- name: VERSION
40+
type: string
41+
default: 'master'
42+
3943
jobs:
4044
- job: ${{ parameters.host }}
4145
# NOTE(compnerd) disable non-x64 builds as they are currently broken :(
@@ -247,6 +251,10 @@ jobs:
247251
-G Ninja
248252
-S $(Build.SourcesDirectory)/swift
249253

254+
- ${{ if eq(parameters.VERSION,'5.3') }}:
255+
- script: |
256+
mklink "$(Build.BinariesDirectory)/swift-stdlib/bin/swiftc" "$(toolchain.directory)/usr/bin/swiftc.exe"
257+
250258
- task: CMake@1
251259
displayName: Build Swift Standard Library
252260
inputs:

.ci/vs2019-swift-5.3.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ stages:
180180
ICU_VERSION: 67
181181
SWIFT_OPTIONS: -DSWIFT_WINDOWS_armv7_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_armv7_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_armv7_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_armv7_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe
182182

183+
VERSION: 5.3
184+
183185
- template: templates/windows-sdk.yml
184186
parameters:
185187
VisualStudio: 2019/Enterprise
@@ -197,6 +199,8 @@ stages:
197199
ICU_VERSION: 67
198200
SWIFT_OPTIONS: -DSWIFT_WINDOWS_aarch64_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_aarch64_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_aarch64_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_aarch64_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe
199201

202+
VERSION: 5.3
203+
200204
- template: templates/windows-sdk.yml
201205
parameters:
202206
VisualStudio: 2019/Enterprise
@@ -214,6 +218,8 @@ stages:
214218
ICU_VERSION: 67
215219
SWIFT_OPTIONS: -DSWIFT_WINDOWS_x86_64_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_x86_64_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_x86_64_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_x86_64_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe
216220

221+
VERSION: 5.3
222+
217223
- template: templates/windows-sdk.yml
218224
parameters:
219225
VisualStudio: 2019/Enterprise
@@ -231,6 +237,8 @@ stages:
231237
ICU_VERSION: 67
232238
SWIFT_OPTIONS: -DSWIFT_WINDOWS_i686_ICU_UC_INCLUDE=$(icu.directory)/usr/include/unicode -DSWIFT_WINDOWS_i686_ICU_UC=$(icu.directory)/usr/lib/icuuc$(icu.version).lib -DSWIFT_WINDOWS_i686_ICU_I18N_INCLUDE=$(icu.directory)/usr/include -DSWIFT_WINDOWS_i686_ICU_I18N=$(icu.directory)/usr/lib/icuin$(icu.version).lib -DPYTHON_EXECUTABLE=$(python.pythonLocation)/python.exe
233239

240+
VERSION: 5.3
241+
234242
- stage: package_toolchain
235243
dependsOn: toolchain
236244
displayName: package Toolchain

0 commit comments

Comments
 (0)