More OS X build changes

Also it fixes previus "OSX build change" commit - new script had wrong permissions
mariadb-corporation · Jun 9, 2020 · 5efdf68 · 5efdf68
1 parent 7b9033e
commit 5efdf68
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -321,7 +321,7 @@ ELSE()
   ADD_LIBRARY(${LIBRARY_NAME} SHARED ${MARIADB_ODBC_SOURCES} maodbcu.rc)
 
   IF(APPLE)
-    SET(MAODBC_INSTALL_RPATH "${ODBC_LIB_DIR}" "/usr/local/opt/libiodbc" "/usr/local/iODBC/lib")
+    SET(MAODBC_INSTALL_RPATH "${ODBC_LIB_DIR}" "./" "/usr/local/opt/libiodbc" "/usr/local/iODBC/lib" "/usr/local/opt/openssl@1.1/lib" "/usr/local/opt/libressl/lib")
     SET_TARGET_PROPERTIES(${LIBRARY_NAME}
                           PROPERTIES LINK_FLAGS "-Wl"
                                      INSTALL_RPATH_USE_LINK_PATH 0

diff --git a/osxpostbuild.sh b/osxpostbuild.sh
@@ -23,3 +23,10 @@ echo $1
 LinkedLibName=`otool -L $1 | grep -i iodbcinst | sed 's/	//' | sed 's/ [(].*$//'`
 echo $LinkedLibName
 install_name_tool -change $LinkedLibName @rpath/libiodbcinst.dylib $1
+LinkedLibName=`otool -L $1 | grep -i libssl | sed 's/	//' | sed 's/ [(].*$//'`
+echo $LinkedLibName
+install_name_tool -change $LinkedLibName @rpath/libssl.1.1.dylib $1
+LinkedLibName=`otool -L $1 | grep -i libcrypto | sed 's/	//' | sed 's/ [(].*$//'`
+echo $LinkedLibName
+install_name_tool -change $LinkedLibName @rpath/libcrypto.1.1.dylib $1
+