Переглянути джерело

Fix ICU4C compilation for 64-bit Windows targets (#2327)

* Fix ICU4C compilation for 64-bit Windows targets

* Try to fix ARM

* Use package:arch() instead of os.arch()

* Delete updated

---------

Co-authored-by: ruki <[email protected]>
Andrej Redeky 2 роки тому
батько
коміт
6f02b03b06
1 змінених файлів з 3 додано та 3 видалено
  1. 3 3
      packages/i/icu4c/xmake.lua

+ 3 - 3
packages/i/icu4c/xmake.lua

@@ -50,14 +50,14 @@ package("icu4c")
             -- icu build requires native tools
             local configs = {path.join("source", "allinone", "allinone.sln")}
             table.insert(configs, "/p:Configuration=Release")
-            table.insert(configs, "/p:Platform=" .. os.arch())
+            table.insert(configs, "/p:Platform=" .. package:arch())
             msbuild.build(package, configs, {upgrade = projectfiles})
         end
         local configs = {path.join("source", "allinone", "allinone.sln"), "/p:SkipUWP=True", "/p:_IsNativeEnvironment=true"}
         msbuild.build(package, configs, {upgrade = projectfiles})
 
-        local suffix = package:is_plat("arm") and "ARM" or ""
-        if package:is_plat("*64") then
+        local suffix = package:is_plat("arm.*") and "ARM" or ""
+        if package:is_arch(".*64") then
             suffix = suffix .. "64"
         end