diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 7ddd609b8ea111c8aabc114eeaf990d94e6ab295..27aec64cc6a3499be0ea2e324df0dc09f89145b3 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -135,7 +135,6 @@ elseif(DARWIN)
         libapr-1.dylib
         libaprutil-1.0.dylib
         libaprutil-1.dylib
-        libexception_handler.dylib
         ${EXPAT_COPY}
         libGLOD.dylib
         libhunspell-1.3.0.dylib
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index beee5132cb82acea7fcd1a6dbaf883fbe0772d5f..1e5b833719b571d41dde81b5fd43c898d6950564 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -8,14 +8,12 @@ set(JPEG_FIND_REQUIRED ON)
 if (USESYSTEMLIBS)
   include(FindJPEG)
 else (USESYSTEMLIBS)
+  use_prebuilt_binary(libjpeg-turbo)
   if (LINUX)
-    use_prebuilt_binary(libjpeg-turbo)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
-    use_prebuilt_binary(jpeglib)
     set(JPEG_LIBRARIES jpeg)
   elseif (WINDOWS)
-    use_prebuilt_binary(libjpeg-turbo)
     set(JPEG_LIBRARIES jpeg)
   endif (LINUX)
   set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index afe1f9abb9b42447b18e74c55b093acd924991f1..b4d4e0921376cdcf1572d207bbc03c277f2e2510 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -299,7 +299,7 @@ target_link_libraries(
 if (DARWIN)
   include(CMakeFindFrameworks)
   find_library(CARBON_LIBRARY Carbon)
-  target_link_libraries(llcommon ${CARBON_LIBRARY})
+  target_link_libraries(llcommon PUBLIC ${CARBON_LIBRARY})
 endif (DARWIN)
 
 add_dependencies(llcommon stage_third_party_libs)