diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml index ad014dcaf50929..3fe9dc5f861b3f 100644 --- a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml +++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml @@ -1,9 +1,5 @@ - - - - + + + + diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems index 8408056788ff54..01918eedac5644 100644 --- a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems +++ b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems @@ -41,6 +41,9 @@ + + $(ILLinkSharedDirectory)ILLinkTrim_LibraryBuild.xml + diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index cf828d4af0ecfa..bdfa0628c5cd08 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -218,6 +218,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") # FIXME: Rest of the flags from configure.ac elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") set(HOST_BROWSER 1) + add_definitions(-DNO_GLOBALIZATION_SHIM) add_definitions(-D_THREAD_SAFE) set(DISABLE_EXECUTABLES 1) # FIXME: Is there a cmake option for this ? diff --git a/src/mono/wasm/build/WasmApp.targets b/src/mono/wasm/build/WasmApp.targets index 6fd32a0a01c981..bc743a92253a03 100644 --- a/src/mono/wasm/build/WasmApp.targets +++ b/src/mono/wasm/build/WasmApp.targets @@ -23,7 +23,7 @@ - $(WasmProfilers) - Profilers to use - $(AOTMode) - Defaults to `LLVMOnly` - $(AOTProfilePath) - profile data file to be used for profile-guided optimization - - $(WasmInvariantGlobalization) + - $(InvariantGlobalization) - Whenever to disable ICU. Defaults to false. - $(WasmResolveAssembliesBeforeBuild) - Resolve the assembly dependencies. Defaults to false - $(WasmAssemblySearchPaths) - used for resolving assembly dependencies @@ -156,7 +156,7 @@ - icudt.dat + icudt.dat <_HasDotnetWasm Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.wasm'">true <_HasDotnetJs Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.js'">true @@ -167,7 +167,7 @@ - + @@ -175,7 +175,7 @@ AppDir="$(WasmAppDir)" MainJS="$(WasmMainJSPath)" Assemblies="@(_WasmAssemblies)" - InvariantGlobalization="$(WasmInvariantGlobalization)" + InvariantGlobalization="$(InvariantGlobalization)" SatelliteAssemblies="@(WasmSatelliteAssemblies)" FilesToIncludeInFileSystem="@(WasmFilesToIncludeInFileSystem)" IcuDataFileName="$(WasmIcuDataFileName)" @@ -250,8 +250,8 @@ <_WasmRuntimePackNativeLibs Include="libSystem.Native.a"/> <_WasmRuntimePackNativeLibs Include="libSystem.IO.Compression.Native.a"/> <_WasmRuntimePackNativeLibs Include="libmono-profiler-aot.a"/> - <_WasmRuntimePackNativeLibs Include="libicuuc.a"/> - <_WasmRuntimePackNativeLibs Include="libicui18n.a"/> + <_WasmRuntimePackNativeLibs Include="libicuuc.a" Condition="'$(InvariantGlobalization)' != 'true'" /> + <_WasmRuntimePackNativeLibs Include="libicui18n.a" Condition="'$(InvariantGlobalization)' != 'true'" /> <_WasmObjects Include="@(_WasmRuntimePackNativeLibs->'$(MicrosoftNetCoreAppRuntimePackRidDir)\native\%(FileName)%(Extension)')" /> <_WasmObjects Include="$(_WasmIntermediateOutputPath)driver.o"/>