Skip to content

Commit

Permalink
[build] Don't add to DOTNET_PLATFORMS if .NET isn't enabled (#18827)
Browse files Browse the repository at this point in the history
This makes it easier to skip .NET stuff if .NET isn’t enabled.
  • Loading branch information
rolfbjarne authored Aug 28, 2023
1 parent 6603e02 commit fd896d4
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ ALL_DOTNET_PLATFORMS=iOS macOS tvOS MacCatalyst

DOTNET_PLATFORMS=
ifdef INCLUDE_IOS
ifdef ENABLE_DOTNET
DOTNET_PLATFORMS+=iOS
DOTNET_IOS_BITNESSES+=64

Expand All @@ -690,9 +691,11 @@ DOTNET_IOS_RUNTIME_IDENTIFIERS_64+=iossimulator-x64 iossimulator-arm64

# All of them
DOTNET_IOS_RUNTIME_IDENTIFIERS=$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32) $(DOTNET_IOS_RUNTIME_IDENTIFIERS_64)
endif # ENABLE_DOTNET
endif # INCLUDE_IOS

ifdef INCLUDE_TVOS
ifdef ENABLE_DOTNET
DOTNET_PLATFORMS+=tvOS
DOTNET_TVOS_BITNESSES+=64
ifdef INCLUDE_DEVICE
Expand All @@ -701,6 +704,7 @@ else
DOTNET_TVOS_RUNTIME_IDENTIFIERS=tvossimulator-x64 tvossimulator-arm64
endif
DOTNET_TVOS_RUNTIME_IDENTIFIERS_64+=$(DOTNET_TVOS_RUNTIME_IDENTIFIERS)
endif # ENABLE_DOTNET
endif

ifdef INCLUDE_DOTNET_WATCHOS
Expand All @@ -716,18 +720,22 @@ endif
endif

ifdef INCLUDE_MACCATALYST
ifdef ENABLE_DOTNET
DOTNET_PLATFORMS+=MacCatalyst
DOTNET_MACCATALYST_BITNESSES+=64
DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS=maccatalyst-x64 maccatalyst-arm64
DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS_64+=$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS)
endif # ENABLE_DOTNET
endif

ifdef INCLUDE_MAC
ifdef ENABLE_DOTNET
DOTNET_PLATFORMS+=macOS
DOTNET_CORECLR_PLATFORMS+=macOS
DOTNET_MACOS_BITNESSES+=64
DOTNET_MACOS_RUNTIME_IDENTIFIERS=osx-x64 osx-arm64
DOTNET_MACOS_RUNTIME_IDENTIFIERS_64=$(DOTNET_MACOS_RUNTIME_IDENTIFIERS)
endif # ENABLE_DOTNET
endif

ifdef INCLUDE_IOS
Expand Down

6 comments on commit fd896d4

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Please sign in to comment.