@@ -40,20 +40,23 @@ stages:
40
40
rootfs :
41
41
archflag : --arch x64
42
42
LLVMTableGenArg :
43
+ ClangTableGenArg :
43
44
arm64 :
44
45
assetManifestOS : linux
45
46
assetManifestPlatform : arm64
46
47
imagename : mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-cfdd435-20200121150126
47
48
rootfs : /crossrootfs/arm64
48
49
archflag : --arch arm64
49
50
LLVMTableGenArg : /p:LLVMTableGenPath=$(Build.SourcesDirectory)/artifacts/obj/BuildRoot-x64/bin/llvm-tblgen
51
+ ClangTableGenArg : /p:ClangTableGenPath=$(Build.SourcesDirectory)/artifacts/obj/BuildRoot-x64/bin/clang-tblgen
50
52
arm :
51
53
assetManifestOS : linux
52
54
assetManifestPlatform : arm
53
55
imagename : mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-09ec757-20200320131433
54
56
rootfs : /crossrootfs/arm
55
57
archflag : --arch arm
56
58
LLVMTableGenArg : /p:LLVMTableGenPath=$(Build.SourcesDirectory)/artifacts/obj/BuildRoot-x64/bin/llvm-tblgen
59
+ ClangTableGenArg : /p:ClangTableGenPath=$(Build.SourcesDirectory)/artifacts/obj/BuildRoot-x64/bin/clang-tblgen
57
60
pool :
58
61
${{ if eq(variables['System.TeamProject'], 'public') }} :
59
62
vmImage : ubuntu-20.04
@@ -75,7 +78,7 @@ stages:
75
78
condition: and(succeeded(), ne(variables['assetManifestPlatform'], 'x64'))
76
79
77
80
- bash : |
78
- ./build.sh --ci --restore --build --pack $(archflag) --configuration $(_BuildConfig) $(_InternalBuildArgs) $(LLVMTableGenArg)
81
+ ./build.sh --ci --restore --build --pack $(archflag) --configuration $(_BuildConfig) $(_InternalBuildArgs) $(LLVMTableGenArg) $(ClangTableGenArg)
79
82
displayName: 'Build and package'
80
83
env:
81
84
ROOTFS_DIR: $(rootfs)
@@ -96,11 +99,13 @@ stages:
96
99
assetManifestPlatform : x64
97
100
archflag : --arch x64
98
101
LLVMTableGenArg :
102
+ ClangTableGenArg :
99
103
arm64 :
100
104
assetManifestOS : osx
101
105
assetManifestPlatform : arm64
102
106
archflag : --arch arm64
103
107
LLVMTableGenArg : /p:LLVMTableGenPath=$(Build.SourcesDirectory)/artifacts/obj/BuildRoot-x64/bin/llvm-tblgen
108
+ ClangTableGenArg : /p:ClangTableGenPath=$(Build.SourcesDirectory)/artifacts/obj/BuildRoot-x64/bin/clang-tblgen
104
109
pool :
105
110
vmImage : macOS-10.15
106
111
steps :
@@ -116,7 +121,7 @@ stages:
116
121
condition: and(succeeded(), ne(variables['assetManifestPlatform'], 'x64'))
117
122
118
123
- bash : |
119
- ./build.sh --ci --restore --build --pack $(archflag) --configuration $(_BuildConfig) $(_InternalBuildArgs) $(LLVMTableGenArg)
124
+ ./build.sh --ci --restore --build --pack $(archflag) --configuration $(_BuildConfig) $(_InternalBuildArgs) $(LLVMTableGenArg) $(ClangTableGenArg)
120
125
displayName: 'Build and package'
121
126
122
127
- bash :
@@ -135,16 +140,19 @@ stages:
135
140
assetManifestPlatform : x64
136
141
archflag : -arch x64
137
142
LLVMTableGenArg :
143
+ ClangTableGenArg :
138
144
arm64 :
139
145
assetManifestOS : win
140
146
assetManifestPlatform : arm64
141
147
archflag : -arch arm64
142
148
LLVMTableGenArg : /p:LLVMTableGenPath=$(Build.SourcesDirectory)\artifacts\obj\BuildRoot-x64\bin\llvm-tblgen.exe
149
+ ClangTableGenArg : /p:ClangTableGenPath=$(Build.SourcesDirectory)\artifacts\obj\BuildRoot-x64\bin\clang-tblgen.exe
143
150
arm :
144
151
assetManifestOS : win
145
152
assetManifestPlatform : arm
146
153
archflag : -arch arm
147
154
LLVMTableGenArg : /p:LLVMTableGenPath=$(Build.SourcesDirectory)\artifacts\obj\BuildRoot-x64\bin\llvm-tblgen.exe
155
+ ClangTableGenArg : /p:ClangTableGenPath=$(Build.SourcesDirectory)\artifacts\obj\BuildRoot-x64\bin\clang-tblgen.exe
148
156
pool :
149
157
${{ if eq(variables['System.TeamProject'], 'public') }} :
150
158
vmImage : windows-2019
@@ -161,7 +169,7 @@ stages:
161
169
displayName : ' Build host llvm-tblgen for cross-compiling'
162
170
condition : and(succeeded(), ne(variables['assetManifestPlatform'], 'x64'))
163
171
164
- - powershell : eng\build.ps1 -ci -restore -build -pack $(archflag) -configuration $(_BuildConfig) $(_InternalBuildArgs) $(LLVMTableGenArg)
172
+ - powershell : eng\build.ps1 -ci -restore -build -pack $(archflag) -configuration $(_BuildConfig) $(_InternalBuildArgs) $(LLVMTableGenArg) $(ClangTableGenArg)
165
173
displayName : ' Build and package'
166
174
167
175
- powershell : eng\common\build.ps1 -ci -restore -publish -configuration $(_BuildConfig) $(_InternalBuildArgs) /p:AssetManifestOS=$(assetManifestOS) /p:PlatformName=$(assetManifestPlatform) -projects $(Build.SourcesDirectory)\llvm.proj
0 commit comments