diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fb8e9a7..e6594f39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,18 +47,10 @@ endif ()
 
 # Clang ------------------------------------------------------------------------
 
-if(UNIX AND NOT APPLE)
-	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake")
-	else()
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake")
-	endif()
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake")
 else()
-	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake")
-	else()
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
-	endif()
+	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake")
 endif()
 
 find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake")
diff --git a/README.md b/README.md
index 9002adab..9a47e154 100644
--- a/README.md
+++ b/README.md
@@ -41,11 +41,10 @@ $ git pull origin master
 $ cd tools/extra/
 $ git pull origin master
 
-$ cd ../../../../../build
+$ cd ../../../../../build_debug
 $ cmake -G Ninja ../llvm
-$ ninja -j 4 check-all
+$ ninja -j4 check-all
 
 $ cd ../release_build
 $ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ../llvm
-$ ninja -j 4 clang
-
+$ ninja -j4 check-all
diff --git a/cmake/CLANGConfig.cmake b/cmake/CLANGConfig.cmake
index 428e2c63..7f6025ac 100644
--- a/cmake/CLANGConfig.cmake
+++ b/cmake/CLANGConfig.cmake
@@ -1,46 +1,23 @@
-if (UNIX AND NOT APPLE)
+execute_process(
+	COMMAND $ENV{CLANG_DIR}/build_debug/bin/llvm-config --cxxflags
+	OUTPUT_VARIABLE CLANG_DEFINITIONS
+)
 
-	execute_process(
-		COMMAND $ENV{CLANG_DIR}/build_debug/bin/llvm-config --cxxflags
-		OUTPUT_VARIABLE CLANG_DEFINITIONS
-	)
+# Remove unwanted flags
+string(REPLACE "-fno-exceptions" "" CLANG_DEFINITIONS ${CLANG_DEFINITIONS})
+string(REPLACE "-fno-rtti" "" CLANG_DEFINITIONS ${CLANG_DEFINITIONS})
 
-	set(CLANG_INCLUDE_DIRS
-		"$ENV{CLANG_DIR}/llvm/tools/clang/include"
-		"$ENV{CLANG_DIR}/build_debug/tools/clang/include"
-	)
+set(CLANG_INCLUDE_DIRS
+	"$ENV{CLANG_DIR}/llvm/tools/clang/include"
+	"$ENV{CLANG_DIR}/build_debug/tools/clang/include"
+)
 
-	set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_debug/lib")
-	if (UNIX)
-		if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-			set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_release/lib")
-		endif()
-	endif ()
-
-else()
-
-	execute_process(
-		COMMAND $ENV{CLANG_DIR}/build/bin/llvm-config --cxxflags
-		OUTPUT_VARIABLE CLANG_DEFINITIONS
-	)
-
-	# Remove unwanted flags
-	string(REPLACE "-fno-exceptions" "" CLANG_DEFINITIONS ${CLANG_DEFINITIONS})
-	string(REPLACE "-fno-rtti" "" CLANG_DEFINITIONS ${CLANG_DEFINITIONS})
-
-	set(CLANG_INCLUDE_DIRS
-		"$ENV{CLANG_DIR}/llvm/tools/clang/include"
-		"$ENV{CLANG_DIR}/build/tools/clang/include"
-	)
-
-	set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build/lib")
-	if (UNIX)
-		if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-			set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_release/lib")
-		endif()
-	endif ()
-
-endif()
+set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_debug/lib")
+if (UNIX)
+	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+		set(CLANG_LIBRARY_DIRS "$ENV{CLANG_DIR}/build_release/lib")
+	endif()
+endif ()
 
 set(CLANG_LIBRARIES
 	#clangApplyReplacements