[wasm] use CMAKE_ICU_DIR instead of CLR_CMAKE_ICU_DIR (dotnet#119463)

Author: pavelsavara

src/coreclr/CMakeLists.txt

@@ -35,10 +35,6 @@ endif()
 
 OPTION(CLR_CMAKE_ENABLE_CODE_COVERAGE "Enable code coverage" OFF)
 
-if (DEFINED CLR_CMAKE_ICU_DIR)
-  include_directories(${CLR_CMAKE_ICU_DIR}/include)
-endif(DEFINED CLR_CMAKE_ICU_DIR)
-
 if (CLR_CMAKE_TARGET_ARCH_WASM)
     add_compile_options(-fwasm-exceptions)
 endif()

src/coreclr/hosts/corerun/CMakeLists.txt

@@ -11,10 +11,6 @@ endif(CLR_CMAKE_HOST_WIN32)
 #Required to expose symbols for global symbol discovery.
 set(CLR_CMAKE_KEEP_NATIVE_SYMBOLS TRUE)
 
-if (DEFINED CLR_CMAKE_ICU_DIR)
-  link_directories(${CLR_CMAKE_ICU_DIR}/lib)
-endif(DEFINED CLR_CMAKE_ICU_DIR)
-
 add_executable_clr(corerun
   corerun.cpp
   dotenv.cpp
@@ -50,14 +46,21 @@ else(CLR_CMAKE_HOST_WIN32)
     if (CLR_CMAKE_TARGET_ARCH_WASM)
         target_link_libraries(corerun PRIVATE
         coreclr_static
-        clrinterpreter
-        icuuc
-        icui18n
-        icudata)
+        clrinterpreter)
         # linker options for NodeJs, link in JavaScript helper, access to local filesystem
         if (CLR_CMAKE_TARGET_BROWSER)
             target_compile_options(corerun PRIVATE -fwasm-exceptions)
-            target_link_options(corerun PRIVATE -fwasm-exceptions -sEXPORTED_RUNTIME_METHODS=FS -sEXIT_RUNTIME=1 -sINITIAL_MEMORY=134217728 -sSTACK_SIZE=5MB -lnoderawfs.js -lnodefs.js --pre-js ${CMAKE_CURRENT_SOURCE_DIR}/corerun.js -Wl,-error-limit=0)
+            target_link_options(corerun PRIVATE
+                -fwasm-exceptions
+                -sEXPORTED_RUNTIME_METHODS=FS
+                -sEXIT_RUNTIME=1
+                -sWASM_BIGINT=1
+                -sINITIAL_MEMORY=134217728
+                -sSTACK_SIZE=5MB
+                -lnoderawfs.js
+                -lnodefs.js
+                --pre-js ${CMAKE_CURRENT_SOURCE_DIR}/corerun.js
+                -Wl,-error-limit=0)
         endif()
     endif()
 endif(CLR_CMAKE_HOST_WIN32)

src/coreclr/hosts/corewasmrun/CMakeLists.txt

@@ -2,10 +2,6 @@ project(corewasmrun)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-if (DEFINED CLR_CMAKE_ICU_DIR)
-  link_directories(${CLR_CMAKE_ICU_DIR}/lib)
-endif(DEFINED CLR_CMAKE_ICU_DIR)
-
 add_executable_clr(corewasmrun
   corewasmrun.cpp
 )
@@ -16,13 +12,17 @@ if (EXISTS "${_WASM_PRELOAD_DIR}")
 endif (EXISTS "${_WASM_PRELOAD_DIR}")
 
 target_compile_options(corewasmrun PRIVATE -fwasm-exceptions)
-target_link_options(corewasmrun PRIVATE -fwasm-exceptions -sEXIT_RUNTIME=1 -sINITIAL_MEMORY=134217728 -sFORCE_FILESYSTEM=1 ${_WASM_PRELOAD_FILE} -Wl,-error-limit=0)
+target_link_options(corewasmrun PRIVATE
+  -fwasm-exceptions
+  -sEXIT_RUNTIME=1
+  -sWASM_BIGINT=1
+  -sINITIAL_MEMORY=134217728
+  -sFORCE_FILESYSTEM=1
+  ${_WASM_PRELOAD_FILE}
+  -Wl,-error-limit=0)
 
 target_link_libraries(corewasmrun PRIVATE
-  coreclr_static
-  icuuc
-  icui18n
-  icudata)
+  coreclr_static)
 
 # The corerun version for wasm is being installed in its own directory
 # because it is an executable that comes with an index.html and we

src/coreclr/runtime.proj

@@ -4,13 +4,14 @@
     <_BuildNativeTargetOS>$(TargetOS)</_BuildNativeTargetOS>
     <_BuildNativeTargetOS Condition="'$(TargetsLinuxBionic)' == 'true'">linux-bionic</_BuildNativeTargetOS>
     <HasCdacBuildTool Condition="'$(ClrFullNativeBuild)' == 'true' or '$(ClrRuntimeSubset)' == 'true' or '$(ClrDebugSubset)' == 'true' or '$(ClrCrossComponentsSubset)' == 'true'">true</HasCdacBuildTool>
+
     <_IcuDir Condition="'$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)' != '' and '$(TargetsBrowser)' == 'true'">$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/$(TargetOS)-$(TargetArchitecture)$(_RuntimeVariant)/native</_IcuDir>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="runtime-prereqs.proj" GlobalPropertiesToRemove="$(NativeBuildPartitionPropertiesToRemove)" />
     <ProjectReference Condition="'$(HasCdacBuildTool)' == 'true'" Include="tools\cdac-build-tool\cdac-build-tool.csproj" ReferenceOutputAssembly="false" GlobalPropertiesToRemove="$(NativeBuildPartitionPropertiesToRemove)" />
-    <PackageReference Condition="'$(TargetsBrowser)' == 'true'" Include="Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" />
+    <PackageReference Condition="'$(TargetsWasm)' == 'true'" Include="Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" />
   </ItemGroup>
 
   <Import Project="$(RepositoryEngineeringDir)nativepgo.targets" />
@@ -51,7 +52,7 @@
       <_CoreClrBuildArg Condition="'$(BuildSubdirectory)' != ''" Include="-subdir $(BuildSubdirectory)" />
       <_CoreClrBuildArg Include="-cmakeargs &quot;-DCLR_DOTNET_HOST_PATH=$(DOTNET_HOST_PATH)&quot;" />
       <_CoreClrBuildArg Condition="'$(HasCdacBuildTool)' == 'true'" Include="-cmakeargs &quot;-DCDAC_BUILD_TOOL_BINARY_PATH=$(RuntimeBinDir)cdac-build-tool\cdac-build-tool.dll&quot;" />
-      <_CoreClrBuildArg Condition="'$(_IcuDir)' != ''" Include="-cmakeargs &quot;-DCLR_CMAKE_ICU_DIR=$(_IcuDir)&quot;" />
+      <_CoreClrBuildArg Condition="'$(_IcuDir)' != ''" Include="-cmakeargs &quot;-DCMAKE_ICU_DIR=$(_IcuDir)&quot;" />
       <_CoreClrBuildArg Condition="'$(FeatureXplatEventSource)' == 'false'" Include="-cmakeargs &quot;-DFEATURE_EVENTSOURCE_XPLAT=0&quot;" />
     </ItemGroup>