Fix building tests on High Sierra

phusion · Mar 28, 2018 · 26e2329 · 26e2329
1 parent 7abfc2e
commit 26e2329
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/build/cxx_tests.rb b/build/cxx_tests.rb
@@ -124,6 +124,7 @@
   [
     libev_cflags,
     libuv_cflags,
+    PlatformInfo.crypto_extra_cflags,
     PlatformInfo.curl_flags,
     TEST_COMMON_CFLAGS
   ]

diff --git a/src/ruby_supportlib/phusion_passenger/platform_info/crypto.rb b/src/ruby_supportlib/phusion_passenger/platform_info/crypto.rb
@@ -29,17 +29,27 @@ module PhusionPassenger
 
   module PlatformInfo
     def self.crypto_libs
+      prefix = ' -framework CoreFoundation -framework Security'
+      suffix = ' -lcrypto'
       if os_name_simple == "macosx"
-        return ' -framework CoreFoundation -framework Security'
+        if os_version < '10.13'
+          return prefix
+        else
+          return "#{prefix} #{openssl_extra_ldflags} #{suffix}"
+        end
       else
-        return ' -lcrypto'
+        return suffix
       end
     end
     memoize :crypto_libs
 
     def self.crypto_extra_cflags
       if os_name_simple == "macosx"
-        return ' -Wno-deprecated-declarations'
+        if os_version < '10.13'
+          return ' -Wno-deprecated-declarations'
+        else
+          return " -Wno-deprecated-declarations #{openssl_extra_cflags}"
+        end
       else
         return ''
       end