Fix publishing libcurl for macosArm64 (#3552)

ktorio · Apr 19, 2023 · 00fff04 · 00fff04
1 parent 2c5dcd2
commit 00fff04
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/ktor-client/ktor-client-curl/desktop/interop/libcurl_arm64.def b/ktor-client/ktor-client-curl/desktop/interop/libcurl_arm64.def
@@ -1,6 +1,6 @@
 package = libcurl
-headers = curl.h
-headerFilter = *
+headers = curl/curl.h
+headerFilter = curl/*
 
 linkerOpts.osx =             -lcurl \
                              -L/usr/lib64 \
@@ -10,18 +10,18 @@ linkerOpts.osx =             -lcurl \
                              -L/opt/homebrew/opt/curl/lib \
                              -L/usr/local/opt/curl/lib
 
-compilerOpts.osx =           -I/opt/homebrew/opt/curl/include/curl \
-                             -I/usr/bin/curl \
-                             -I/usr/local/include/curl \
-                             -I/usr/include/curl \
-                             -I/usr/local/Cellar/curl/7.83.1/include/curl \
-                             -I/usr/local/Cellar/curl/7.81.0/include/curl \
-                             -I/usr/local/Cellar/curl/7.80.0_1/include/curl \
-                             -I/usr/local/Cellar/curl/7.80.0/include/curl \
-                             -I/usr/local/Cellar/curl/7.62.0/include/curl \
-                             -I/usr/local/Cellar/curl/7.63.0/include/curl \
-                             -I/usr/local/Cellar/curl/7.65.3/include/curl \
-                             -I/usr/local/Cellar/curl/7.66.0/include/curl
+compilerOpts.osx =           -I/opt/homebrew/opt/curl/include/ \
+                             -I/usr/bin/ \
+                             -I/usr/local/include/ \
+                             -I/usr/include/ \
+                             -I/usr/local/Cellar/curl/7.83.1/include/ \
+                             -I/usr/local/Cellar/curl/7.81.0/include/ \
+                             -I/usr/local/Cellar/curl/7.80.0_1/include/ \
+                             -I/usr/local/Cellar/curl/7.80.0/include/ \
+                             -I/usr/local/Cellar/curl/7.62.0/include/ \
+                             -I/usr/local/Cellar/curl/7.63.0/include/ \
+                             -I/usr/local/Cellar/curl/7.65.3/include/ \
+                             -I/usr/local/Cellar/curl/7.66.0/include/
 
 
 linkerOpts.linux =           -lcurl \
@@ -32,5 +32,5 @@ linkerOpts.linux =           -lcurl \
                              -L/opt/homebrew/opt/curl/lib
 
 compilerOpts.linux =         -I/usr/include/curl \
-                             -I/usr/include/x86_64-linux-gnu/curl \
-                             -I/opt/homebrew/opt/curl/include/curl
+                             -I/usr/include/x86_64-linux-gnu/ \
+                             -I/opt/homebrew/opt/curl/include/