Fix

indoorvivants · Nov 19, 2023 · 1b7cfd3 · 1b7cfd3
1 parent f96fbf0
commit 1b7cfd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
 
           PLATFORM="$(uname)"
           if [ $PLATFORM == "Darwin" ]; then 
-            echo "It's a Mac"
+            python3 -m pip install packaging
           else
             docker run -p 5432:5432 -e POSTGRES_PASSWORD=mysecretpassword -d postgres
             docker run -e MYSQL_ROOT_PASSWORD=my-secret-pw -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql-password -e MYSQL_DATABASE=mysql_db -p 3306:3306 -d mysql

diff --git a/build.sbt b/build.sbt
@@ -170,9 +170,10 @@ lazy val mysql =
       nativeConfig := {
 
         val config = nativeConfig.value
-        config.withLinkingOptions(config.linkingOptions.map {
-          case "-lresolv-lresolv" => "-lresolv"
-          case other              => other
+        config.withLinkingOptions(config.linkingOptions.flatMap {
+          case "-lresolv-lresolv" => Some("-lresolv")
+          case "-lm-lresolv"      => None
+          case other              => Some(other)
         })
 
       },