Skip to content

Commit 15e39c4

Browse files
committed
Adapt to runtime's native build infra
1 parent 4846b44 commit 15e39c4

36 files changed

+489
-2204
lines changed

CMakeLists.txt

Lines changed: 50 additions & 524 deletions
Large diffs are not rendered by default.

Test.cmd

Lines changed: 0 additions & 3 deletions
This file was deleted.

compileoptions.cmake

Lines changed: 0 additions & 161 deletions
This file was deleted.

crossgen.cmake

Lines changed: 0 additions & 27 deletions
This file was deleted.

diagnostics.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ stages:
175175
parameters:
176176
name: MacOS_cross
177177
osGroup: MacOS_cross
178+
crossbuild: true
178179
buildAndSkipTest: true
179180
strategy:
180181
matrix:

eng/Build-Native.cmd

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ if /i %__BuildCrossArch% EQU 1 (
192192
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:\=/%"
193193

194194
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!
196196
@if defined _echo @echo on
197197
popd
198198

@@ -235,13 +235,9 @@ if %__Build% EQU 1 (
235235
if /i "%__BuildArch%" == "x86" ( set __VCBuildArch=x86 )
236236
if /i "%__BuildArch%" == "arm" (
237237
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"
240238
)
241239
if /i "%__BuildArch%" == "arm64" (
242240
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"
245241
)
246242

247243
echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" !__VCBuildArch!
@@ -266,10 +262,10 @@ if %__Build% EQU 1 (
266262

267263
set "__ManagedBinaryDir=%__RootBinDir%\bin"
268264
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:\=/%"
270266

271267
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!
273269
@if defined _echo @echo on
274270
popd
275271

0 commit comments

Comments
 (0)