Sfoglia il codice sorgente

mbedtls: fix build type

star9029 4 mesi fa
parent
commit
b816bcaf1f
1 ha cambiato i file con 8 aggiunte e 9 eliminazioni
  1. 8 9
      packages/m/mbedtls/xmake.lua

+ 8 - 9
packages/m/mbedtls/xmake.lua

@@ -33,16 +33,20 @@ package("mbedtls")
     end
 
     on_install(function (package)
+        if package:config("shared") and package:is_plat("windows") then
+            io.replace("library/constant_time_impl.h", "extern volatile", "__declspec(dllimport) volatile", {plain = true})
+            io.replace("include/mbedtls/x509_crt.h", "extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb;", "__declspec(dllimport) const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb;", {plain = true})
+            io.replace("include/mbedtls/x509_crt.h", "extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default;", "__declspec(dllimport) const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default;", {plain = true})
+            io.replace("library/psa_util_internal.h", "extern const mbedtls_error_pair_t psa_to_ssl_errors[7];", "__declspec(dllimport) const mbedtls_error_pair_t psa_to_ssl_errors[7];", {plain = true})
+        end
+
         local configs = {"-DENABLE_TESTING=OFF", "-DENABLE_PROGRAMS=OFF", "-DMBEDTLS_FATAL_WARNINGS=OFF"}
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         if package:config("shared") then
             table.insert(configs, "-DUSE_SHARED_MBEDTLS_LIBRARY=ON")
             table.insert(configs, "-DUSE_STATIC_MBEDTLS_LIBRARY=OFF")
             if package:is_plat("windows") then
                 table.insert(configs, "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON")
-                io.replace("library/constant_time_impl.h", "extern volatile", "__declspec(dllimport) volatile", {plain = true})
-                io.replace("include/mbedtls/x509_crt.h", "extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb;", "__declspec(dllimport) const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_suiteb;", {plain = true})
-                io.replace("include/mbedtls/x509_crt.h", "extern const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default;", "__declspec(dllimport) const mbedtls_x509_crt_profile mbedtls_x509_crt_profile_default;", {plain = true})
-                io.replace("library/psa_util_internal.h", "extern const mbedtls_error_pair_t psa_to_ssl_errors[7];", "__declspec(dllimport) const mbedtls_error_pair_t psa_to_ssl_errors[7];", {plain = true})
             end
         else
             table.insert(configs, "-DUSE_SHARED_MBEDTLS_LIBRARY=OFF")
@@ -53,11 +57,6 @@ package("mbedtls")
         if package:is_plat("mingw") and package:is_arch("i386") then
             cxflags = {"-maes", "-msse2", "-mpclmul"}
         end
-        if package:is_plat("windows") then
-            os.mkdir(path.join(package:buildir(), "library/pdb"))
-            os.mkdir(path.join(package:buildir(), "3rdparty/p256-m/pdb"))
-            os.mkdir(path.join(package:buildir(), "3rdparty/everest/pdb"))
-        end
         import("package.tools.cmake").install(package, configs, {cxflags = cxflags})
     end)