Update the Mac build

Author: trink

CMakeLists.txt

@@ -78,10 +78,14 @@ if (MINGW)
 elseif(APPLE)
     set(CPACK_GENERATOR "PackageMaker")
     set(LDFLAGS "-ldflags=\"-linkmode=external\"")
+    set(CGO_LDFLAGS "cgo LDFLAGS: -L${LUA_LIB_PATH} -lluasandbox -llua -ldl -lm")
 elseif(UNIX)
     set(CPACK_GENERATOR "TGZ")
     set(LDFLAGS "-ldflags=\"-s\"")
-    set(CGO_LDFLAGS "cgo LDFLAGS: -L${LUA_LIB_PATH} -Wl,-rpath,$ORIGIN/../lib -lluasandbox -llua -ldl -lm")
+    if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        set(LINK_DL "-ldl")
+    endif()
+    set(CGO_LDFLAGS "cgo LDFLAGS: -L${LUA_LIB_PATH} -Wl,-rpath,$ORIGIN/../lib -lluasandbox -llua ${LINK_DL} -lm")
 
     find_program(DPKG_EXECUTABLE dpkg PATH_SUFFIXES bin)
 
@@ -180,7 +184,7 @@ if (MINGW AND INCLUDE_SANDBOX)
     COMMENT "Install dll's for the mock generation and unit tests")
     install(DIRECTORY "${PROJECT_PATH}/lib/" DESTINATION bin PATTERN "*.dll")
 else()
-    install(DIRECTORY "${PROJECT_PATH}/lib/" DESTINATION lib PATTERN "*.so")
+    install(DIRECTORY "${PROJECT_PATH}/lib/" DESTINATION lib PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
 endif()
 
 install(PROGRAMS "${HEKA_EXE}" DESTINATION bin)

cmake/externals.cmake

@@ -15,11 +15,11 @@ set_property(DIRECTORY PROPERTY EP_BASE "${CMAKE_BINARY_DIR}/ep_base")
 if(INCLUDE_SANDBOX)
     set(PLUGIN_LOADER ${PLUGIN_LOADER} "github.com/mozilla-services/heka/sandbox/plugins")
     set(SANDBOX_PACKAGE "lua_sandbox")
-    set(SANDBOX_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${PROJECT_PATH} -DADDRESS_MODEL=${ADDRESS_MODEL} -DLUA_JIT=off -LIB_TYPE=SHARED --no-warn-unused-cli)
+    set(SANDBOX_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${PROJECT_PATH} -DLUA_JIT=off --no-warn-unused-cli)
     externalproject_add(
         ${SANDBOX_PACKAGE}
         GIT_REPOSITORY https://github.com/mozilla-services/lua_sandbox.git
-        GIT_TAG 59412542661241fa15da89327fde62c015687a88
+        GIT_TAG 84ffce0b5ff221a903984e9ac1020cb3b8b84860
         CMAKE_ARGS ${SANDBOX_ARGS}
         INSTALL_DIR ${PROJECT_PATH}
     )

env.sh

@@ -9,6 +9,7 @@ BUILD_DIR=$PWD/build
 export CTEST_OUTPUT_ON_FAILURE=1
 export GOPATH=$BUILD_DIR/heka
 export LD_LIBRARY_PATH=$BUILD_DIR/heka/lib
+export DYLD_LIBRARY_PATH=$BUILD_DIR/heka/lib
 export GOBIN=$GOPATH/bin
 export PATH=$GOBIN:$PATH