@@ -192,7 +192,7 @@ if /i %__BuildCrossArch% EQU 1 (
192
192
set __ExtraCmakeArgs = " -DCLR_MANAGED_BINARY_DIR=!__ManagedBinaryDir! " " -DCLR_BUILD_TYPE=%__BuildType% " " -DCLR_CMAKE_TARGET_ARCH=%__BuildArch% " " -DCMAKE_SYSTEM_VERSION=10.0" " -DNUGET_PACKAGES=%NUGET_PACKAGES:\ =/ % "
193
193
194
194
pushd " %__CrossCompIntermediatesDir% "
195
- call " %__ProjectDir% \eng\gen-buildsys-win.bat " " %__ProjectDir% " %__VSVersion% %__CrossArch% !__ExtraCmakeArgs!
195
+ call " %__ProjectDir% \eng\native\ gen-buildsys.cmd " " %__ProjectDir% " " %__CrossCompIntermediatesDir %" %__VSVersion% %__CrossArch% !__ExtraCmakeArgs!
196
196
@ if defined _echo @ echo on
197
197
popd
198
198
@@ -235,13 +235,9 @@ if %__Build% EQU 1 (
235
235
if /i " %__BuildArch% " == " x86" ( set __VCBuildArch = x86 )
236
236
if /i " %__BuildArch% " == " arm" (
237
237
set __VCBuildArch = x86_arm
238
- :: Make CMake pick the highest installed version in the 10.0.* range
239
- set ___SDKVersion = " -DCMAKE_SYSTEM_VERSION=10.0"
240
238
)
241
239
if /i " %__BuildArch% " == " arm64" (
242
240
set __VCBuildArch = x86_arm64
243
- :: Make CMake pick the highest installed version in the 10.0.* range
244
- set ___SDKVersion = " -DCMAKE_SYSTEM_VERSION=10.0"
245
241
)
246
242
247
243
echo %__MsgPrefix% Using environment: " %__VCToolsRoot% \vcvarsall.bat" !__VCBuildArch!
@@ -266,10 +262,10 @@ if %__Build% EQU 1 (
266
262
267
263
set " __ManagedBinaryDir = %__RootBinDir% \bin"
268
264
set " __ManagedBinaryDir = !__ManagedBinaryDir:\ =/ ! "
269
- set __ExtraCmakeArgs = !___SDKVersion! " -DCLR_MANAGED_BINARY_DIR=!__ManagedBinaryDir! " " -DCLR_BUILD_TYPE=%__BuildType% " " -DCLR_CMAKE_TARGET_ARCH=%__BuildArch% " " -DNUGET_PACKAGES=%NUGET_PACKAGES:\ =/ % "
265
+ set __ExtraCmakeArgs = " -DCMAKE_SYSTEM_VERSION=10.0 " " -DCLR_MANAGED_BINARY_DIR=!__ManagedBinaryDir! " " -DCLR_BUILD_TYPE=%__BuildType% " " -DCLR_CMAKE_TARGET_ARCH=%__BuildArch% " " -DNUGET_PACKAGES=%NUGET_PACKAGES:\ =/ % "
270
266
271
267
pushd " %__IntermediatesDir% "
272
- call " %__ProjectDir% \eng\gen-buildsys-win.bat " " %__ProjectDir% " %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
268
+ call " %__ProjectDir% \eng\native\ gen-buildsys.cmd " " %__ProjectDir% " " %__IntermediatesDir %" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
273
269
@ if defined _echo @ echo on
274
270
popd
275
271
0 commit comments