diff --git a/src/cmake/llvm_macros.cmake b/src/cmake/llvm_macros.cmake
index 6e3d1772f..acd7272c8 100644
--- a/src/cmake/llvm_macros.cmake
+++ b/src/cmake/llvm_macros.cmake
@@ -54,20 +54,15 @@ function ( EMBED_LLVM_BITCODE_IN_CPP src_list suffix output_name list_to_append_
                     NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_ENVIRONMENT_PATH)
         endif ()
 
-
-        # Fix specific problem I had on new Apple systems (e.g. Mavericks) with
-        # LLVM/libc++ installed -- for some reason, LLVM 3.4 wasn't finding it,
-        # so in that specific case, append another -I to point it in the right
-        # direction.
-        #if (APPLE AND ${LLVM_BC_GENERATOR} MATCHES ".*clang.*")
-        #    exec_program ( "${LLVM_BC_GENERATOR}" ARGS --version OUTPUT_VARIABLE MY_CLANG_VERSION )
-        #    string (REGEX REPLACE "clang version ([0-9][.][0-9]+).*" "\\1" MY_CLANG_VERSION "${MY_CLANG_VERSION}")
-        #    if ((${MY_CLANG_VERSION} VERSION_GREATER "3.3")
-        #          AND (EXISTS "/usr/lib/libc++.dylib")
-        #          AND (EXISTS "/Library/Developer/CommandLineTools/usr/lib/c++/v1"))
-        #        set (LLVM_COMPILE_FLAGS ${LLVM_COMPILE_FLAGS} "-I/Library/Developer/CommandLineTools/usr/lib/c++/v1")
-        #    endif ()
-        #endif ()
+        if (APPLE)
+            list (APPEND LLVM_COMPILE_FLAGS -isysroot ${CMAKE_OSX_SYSROOT})
+            if (CMAKE_OSX_DEPLOYMENT_TARGET)
+                list (APPEND LLVM_COMPILE_FLAGS -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET})
+            endif ()
+            if (CMAKE_OSX_ARCHITECTURES)
+                list (APPEND LLVM_COMPILE_FLAGS -arch ${CMAKE_OSX_ARCHITECTURES})
+            endif ()
+        endif ()
 
         list (TRANSFORM include_dirs PREPEND -I
             OUTPUT_VARIABLE ALL_INCLUDE_DIRS)