Fix polyglot-related build issues

Change-Id: I16b1675069104662ceabf373c8ef9ff0aa835af9

Author: Paweł Andruszkiewicz

CMakeLists.txt

@@ -759,10 +759,21 @@ IF (BUNDLED_POLYGLOT_DIR)
   FIND_LIBRARY(POLYGLOT_LIBRARY
     NAMES
       polyglot
+      libpolyglot
     HINTS
       "${BUNDLED_POLYGLOT_DIR}"
     NO_DEFAULT_PATH)
 
+  IF(APPLE)
+    # reset the ID to something predictible
+    get_filename_component(POLYGLOT_LIBRARY_NAME "${POLYGLOT_LIBRARY}" NAME)
+    EXECUTE_PROCESS(COMMAND install_name_tool -id "${POLYGLOT_LIBRARY_NAME}" "${POLYGLOT_LIBRARY}" RESULT_VARIABLE COMMAND_RESULT)
+
+    IF(NOT "${COMMAND_RESULT}" STREQUAL "0")
+      MESSAGE(FATAL_ERROR "Failed to execute: install_name_tool -id ${POLYGLOT_LIBRARY_NAME} ${POLYGLOT_LIBRARY}")
+    ENDIF()
+  ENDIF()
+
   INCLUDE_DIRECTORIES(SYSTEM "${BUNDLED_POLYGLOT_DIR}")
   MESSAGE(STATUS "Polyglot Library: ${POLYGLOT_LIBRARY}")  
   SET(HAVE_JS 1)

cmake/exeutils.cmake

@@ -89,6 +89,13 @@ function(add_shell_executable)
                 "${ANTLR4_LIB_FILENAME}" "@loader_path/../${INSTALL_LIBDIR}/${ANTLR4_LIB_FILENAME}"
                 $<TARGET_FILE:${ARGV0}>)
     endif()
+    if(BUNDLED_POLYGLOT_DIR)
+      add_custom_command(TARGET "${ARGV0}" POST_BUILD
+        COMMAND install_name_tool -change
+                "${POLYGLOT_LIBRARY_NAME}" "@loader_path/../${INSTALL_LIBDIR}/${POLYGLOT_LIBRARY_NAME}"
+                $<TARGET_FILE:${ARGV0}>
+      )
+    endif()
   elseif(NOT WIN32)
   if(BUNDLED_OPENSSL OR BUNDLED_SHARED_PYTHON OR BUNDLED_SSH_DIR OR BUNDLED_KRB5_DIR OR BUNDLED_ANTLR_DIR OR BUNDLED_SASL_DIR)
     # newer versions of linker enable new dtags by default, causing -Wl,-rpath to create RUNPATH