File tree Expand file tree Collapse file tree 2 files changed +8
-2
lines changed 
native/libs/System.Globalization.Native Expand file tree Collapse file tree 2 files changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -739,7 +739,7 @@ elseif(HOST_BROWSER)
739739  set (STATIC_ICU 1)
740740  set (ICU_LIBS "icucore" )
741741elseif (HOST_IOS OR  HOST_TVOS OR  HOST_MACCAT)
742-   set (ICU_FLAGS "-DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option -Wno-deprecated-declarations " )
742+   set (ICU_FLAGS "-DTARGET_UNIX -DU_DISABLE_RENAMING -Wno-reserved-id-macro -Wno-documentation -Wno-documentation-unknown-command -Wno-switch-enum -Wno-covered-switch-default -Wno-extra-semi-stmt -Wno-unknown-warning-option" )
743743  set (HAVE_SYS_ICU 1)
744744  set (STATIC_ICU 1)
745745  set (ICU_LIBS icuuc icui18n icudata)
Original file line number Diff line number Diff line change 11if (CLR_CMAKE_TARGET_ANDROID OR  CLR_CMAKE_TARGET_APPLE OR  CLR_CMAKE_TARGET_BROWSER OR  CLR_CMAKE_TARGET_WASI)
22    set (HAVE_SET_MAX_VARIABLE 1)
33    set (HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS 1)
4-     set (HAVE_UCOL_CLONE 0)
4+     
5+     # Android uses its own system ICU 
6+     if (CLR_CMAKE_TARGET_ANDROID)
7+         set (HAVE_UCOL_CLONE 0)
8+     else ()
9+         set (HAVE_UCOL_CLONE 1)
10+     endif ()
511else ()
612    include (CheckCSourceCompiles)
713    include (CheckSymbolExists)
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments