Skip to content

Commit d427a98

Browse files
compnerdcompnerd
committed
GHA: use llvm-mt instead of mt
Now that we build with libxml2, use the LLVM manifest tool over the Microsoft one.
1 parent 256956e commit d427a98

File tree

2 files changed

+11
-34
lines changed

2 files changed

+11
-34
lines changed

‎.github/workflows/build-toolchain.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ jobs:
379379
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
380380
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
381381
"cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}\"",
382-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64 -D CMAKE_MT=mt"
382+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
383383
},
384384
{
385385
"arch": "arm64",
@@ -393,7 +393,7 @@ jobs:
393393
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
394394
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
395395
"cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}\"",
396-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64 -D CMAKE_MT=mt"
396+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
397397
}
398398
]
399399
}
@@ -412,7 +412,7 @@ jobs:
412412
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
413413
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
414414
"cmake_linker_flags": "-D CMAKE_EXE_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}\" -D CMAKE_SHARED_LINKER_FLAGS=\"${{ steps.context.outputs.WINDOWS_CMAKE_SHARED_LINKER_FLAGS }}\"",
415-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64 -D CMAKE_MT=mt"
415+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
416416
}
417417
]
418418
}
@@ -427,7 +427,7 @@ jobs:
427427
"cxx": "cl",
428428
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
429429
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
430-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64 -D CMAKE_MT=mt"
430+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
431431
}
432432
]
433433
}
@@ -442,7 +442,7 @@ jobs:
442442
"cxx": "cl",
443443
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
444444
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
445-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64 -D CMAKE_MT=mt"
445+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
446446
}
447447
]
448448
}
@@ -457,7 +457,7 @@ jobs:
457457
"cxx": "cl",
458458
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
459459
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
460-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64 -D CMAKE_MT=mt"
460+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
461461
},
462462
{
463463
"arch": "arm64",
@@ -467,7 +467,7 @@ jobs:
467467
"cxx": "cl",
468468
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
469469
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
470-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64 -D CMAKE_MT=mt"
470+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
471471
},
472472
{
473473
"arch": "x86",
@@ -477,7 +477,7 @@ jobs:
477477
"cxx": "cl",
478478
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
479479
"swiftflags": "",
480-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86 -D CMAKE_MT=mt"
480+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86"
481481
},
482482
{
483483
"arch": "arm64",
@@ -532,7 +532,7 @@ jobs:
532532
"cxx": "cl",
533533
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
534534
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
535-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64 -D CMAKE_MT=mt"
535+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=AMD64"
536536
},
537537
{
538538
"arch": "arm64",
@@ -542,7 +542,7 @@ jobs:
542542
"cxx": "cl",
543543
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
544544
"swiftflags": "${{ steps.context.outputs.WINDOWS_CMAKE_Swift_FLAGS }}",
545-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64 -D CMAKE_MT=mt"
545+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=ARM64"
546546
},
547547
{
548548
"arch": "x86",
@@ -552,7 +552,7 @@ jobs:
552552
"cxx": "cl",
553553
"cxxflags": "${{ steps.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}",
554554
"swiftflags": "",
555-
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86 -D CMAKE_MT=mt"
555+
"extra_flags": "-D CMAKE_SYSTEM_PROCESSOR=X86"
556556
}
557557
]
558558
}

‎.github/workflows/swift-toolchain.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ jobs:
396396
-D CMAKE_CXX_COMPILER=cl `
397397
-D CMAKE_C_FLAGS="${{ inputs.WINDOWS_CMAKE_C_FLAGS }}" `
398398
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
399-
-D CMAKE_MT=mt `
400399
-G Ninja
401400
402401
- name: Build RegsGen2
@@ -494,7 +493,6 @@ jobs:
494493
-D CMAKE_C_FLAGS="${{ matrix.cflags }}" `
495494
-D CMAKE_CXX_COMPILER=${{ matrix.cxx }} `
496495
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
497-
-D CMAKE_MT=mt `
498496
-D MSVC_C_ARCHITECTURE_ID=${{ matrix.arch }} `
499497
-D DS2_REGSGEN2=${{ github.workspace }}/BinaryCache/RegsGen2/regsgen2.exe `
500498
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BinaryCache/Library/Developer `
@@ -997,8 +995,6 @@ jobs:
997995
# FIXME(compnerd) re-enable runtimes after we sort out compiler-rt
998996
(Get-Content ${{ github.workspace }}/SourceCache/swift/cmake/caches/Windows-aarch64.cmake).Replace(' runtimes', '') | Set-Content ${{ github.workspace }}/SourceCache/swift/cmake/caches/Windows-aarch64.cmake
999997
} else {
1000-
# FIXME(steelskin) Setting `CMAKE_SYSTEM_PROCESSOR` and `CMAKE_SYSTEM_NAME` breaks the compiler-rt build.
1001-
$EXTRA_FLAGS += @("-D", "CMAKE_MT=mt")
1002998
$CACHE="${{ github.workspace }}/SourceCache/swift/cmake/caches/Windows-x86_64.cmake"
1003999
}
10041000
$CC = "cl"
@@ -1727,7 +1723,6 @@ jobs:
17271723
-D CMAKE_C_FLAGS="${{ matrix.cflags }}" `
17281724
-D CMAKE_CXX_COMPILER=${{ matrix.cxx }} `
17291725
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
1730-
-D CMAKE_MT=mt `
17311726
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr `
17321727
-D CMAKE_SYSTEM_NAME=${{ matrix.os }} `
17331728
${{ matrix.llvm_flags }} `
@@ -1769,7 +1764,6 @@ jobs:
17691764
-D CMAKE_CXX_COMPILER=${{ matrix.cxx }} `
17701765
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
17711766
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
1772-
-D CMAKE_MT=mt `
17731767
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr `
17741768
-D CMAKE_SYSTEM_NAME=${{ matrix.os }} `
17751769
-D CMAKE_SYSTEM_PROCESSOR=${CMAKE_CPU} `
@@ -2232,7 +2226,6 @@ jobs:
22322226
-D CMAKE_CXX_COMPILER=${{ matrix.cxx }} `
22332227
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
22342228
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
2235-
-D CMAKE_MT=mt `
22362229
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr `
22372230
-D CMAKE_Swift_COMPILER=${SWIFTC} `
22382231
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple_no_api_level }} `
@@ -2301,7 +2294,6 @@ jobs:
23012294
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
23022295
-D CMAKE_EXE_LINKER_FLAGS="${{ inputs.WINDOWS_CMAKE_EXE_LINKER_FLAGS }}" `
23032296
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=YES `
2304-
-D CMAKE_MT=mt `
23052297
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/SDKs/${{ matrix.os }}.sdk/usr `
23062298
-D CMAKE_Swift_COMPILER=${SWIFTC} `
23072299
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple_no_api_level }} `
@@ -2369,7 +2361,6 @@ jobs:
23692361
-D CMAKE_CXX_COMPILER=${{ matrix.cxx }} `
23702362
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
23712363
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
2372-
-D CMAKE_MT=mt `
23732364
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform/Developer/Library/XCTest-development/usr `
23742365
-D CMAKE_Swift_COMPILER=${SWIFTC} `
23752366
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple_no_api_level }} `
@@ -2703,7 +2694,6 @@ jobs:
27032694
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
27042695
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
27052696
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2706-
-D CMAKE_MT=mt `
27072697
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
27082698
-D CMAKE_Swift_COMPILER=${SWIFTC} `
27092699
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -2733,7 +2723,6 @@ jobs:
27332723
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
27342724
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
27352725
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2736-
-D CMAKE_MT=mt `
27372726
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
27382727
-D CMAKE_Swift_COMPILER=${SWIFTC} `
27392728
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -2762,7 +2751,6 @@ jobs:
27622751
-D CMAKE_CXX_COMPILER=cl `
27632752
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
27642753
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2765-
-D CMAKE_MT=mt `
27662754
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
27672755
-D CMAKE_Swift_COMPILER=${SWIFTC} `
27682756
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -2791,7 +2779,6 @@ jobs:
27912779
-D CMAKE_CXX_COMPILER=cl `
27922780
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
27932781
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2794-
-D CMAKE_MT=mt `
27952782
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
27962783
-D CMAKE_Swift_COMPILER=${SWIFTC} `
27972784
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -2820,7 +2807,6 @@ jobs:
28202807
-D CMAKE_CXX_COMPILER=cl `
28212808
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
28222809
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2823-
-D CMAKE_MT=mt `
28242810
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
28252811
-D CMAKE_Swift_COMPILER=${SWIFTC} `
28262812
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -2853,7 +2839,6 @@ jobs:
28532839
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
28542840
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
28552841
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2856-
-D CMAKE_MT=mt `
28572842
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
28582843
-D CMAKE_Swift_COMPILER=${SWIFTC} `
28592844
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -2883,7 +2868,6 @@ jobs:
28832868
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
28842869
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
28852870
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2886-
-D CMAKE_MT=mt `
28872871
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
28882872
-D CMAKE_Swift_COMPILER=${SWIFTC} `
28892873
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -2916,7 +2900,6 @@ jobs:
29162900
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
29172901
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
29182902
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2919-
-D CMAKE_MT=mt `
29202903
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
29212904
-D CMAKE_Swift_COMPILER=${SWIFTC} `
29222905
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -3003,7 +2986,6 @@ jobs:
30032986
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
30042987
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
30052988
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
3006-
-D CMAKE_MT=mt `
30072989
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
30082990
-D CMAKE_Swift_COMPILER=${SWIFTC} `
30092991
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -3046,7 +3028,6 @@ jobs:
30463028
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
30473029
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
30483030
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
3049-
-D CMAKE_MT=mt `
30503031
-D CMAKE_Swift_COMPILER=${SWIFTC} `
30513032
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
30523033
-D CMAKE_Swift_COMPILER_WORKS=YES `
@@ -3074,7 +3055,6 @@ jobs:
30743055
-D CMAKE_C_COMPILER=${CLANG_CL} `
30753056
-D CMAKE_C_COMPILER_TARGET=${{ matrix.triple }} `
30763057
-D CMAKE_C_FLAGS="${{ inputs.WINDOWS_CMAKE_C_FLAGS }}" `
3077-
-D CMAKE_MT=mt `
30783058
-D CMAKE_Swift_COMPILER=${SWIFTC} `
30793059
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
30803060
-D CMAKE_Swift_COMPILER_WORKS=YES `
@@ -3107,7 +3087,6 @@ jobs:
31073087
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
31083088
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
31093089
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }} -I${env:SDKROOT}/usr/include -I${env:SDKROOT}/usr/include/Block" `
3110-
-D CMAKE_MT=mt `
31113090
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
31123091
-D CMAKE_Swift_COMPILER=${SWIFTC} `
31133092
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -3137,7 +3116,6 @@ jobs:
31373116
-D CMAKE_CXX_COMPILER=${CLANG_CL} `
31383117
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
31393118
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
3140-
-D CMAKE_MT=mt `
31413119
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
31423120
-D CMAKE_Swift_COMPILER=${SWIFTC} `
31433121
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
@@ -3305,7 +3283,6 @@ jobs:
33053283
cmake -B ${{ github.workspace }}/BinaryCache/${{ matrix.arch }}/swift-inspect `
33063284
-D CMAKE_BUILD_TYPE=Release `
33073285
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
3308-
-D CMAKE_MT=mt `
33093286
-D CMAKE_Swift_COMPILER=${SWIFTC} `
33103287
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
33113288
-D CMAKE_Swift_COMPILER_WORKS=YES `

0 commit comments

Comments
 (0)