Преглед на файлове

protobuf-cpp: remove non-host protoc (#5960)

star9029 преди 8 месеца
родител
ревизия
b0a7b31b13
променени са 1 файла, в които са добавени 7 реда и са изтрити 3 реда
  1. 7 3
      packages/p/protobuf-cpp/xmake.lua

+ 7 - 3
packages/p/protobuf-cpp/xmake.lua

@@ -52,13 +52,13 @@ package("protobuf-cpp")
             package:add("deps", "ninja")
             package:add("deps", "ninja")
             package:set("policy", "package.cmake_generator.ninja", true)
             package:set("policy", "package.cmake_generator.ninja", true)
         end
         end
-    
+
         if package:is_plat("windows") then
         if package:is_plat("windows") then
             package:add("links", "libprotoc", "libprotobuf", "utf8_range", "utf8_validity")
             package:add("links", "libprotoc", "libprotobuf", "utf8_range", "utf8_validity")
         else
         else
             package:add("links", "protoc", "protobuf", "utf8_range", "utf8_validity")
             package:add("links", "protoc", "protobuf", "utf8_range", "utf8_validity")
         end
         end
-    
+
         if package:is_plat("linux", "bsd", "mingw") then
         if package:is_plat("linux", "bsd", "mingw") then
             package:add("syslinks", "m", "pthread")
             package:add("syslinks", "m", "pthread")
         end
         end
@@ -167,7 +167,11 @@ package("protobuf-cpp")
         end
         end
         import("package.tools.cmake").install(package, configs, opt)
         import("package.tools.cmake").install(package, configs, opt)
 
 
-        os.trycp("build/Release/protoc.exe", package:installdir("bin"))
+        if package:is_cross() then
+            os.tryrm(package:installdir("bin/*"))
+        else
+            os.trycp("build/Release/protoc.exe", package:installdir("bin"))
+        end
     end)
     end)
 
 
     on_test(function (package)
     on_test(function (package)