Merge pull request #6100 from EOSIO/fix/remove_llvm_link

Remove llvm@4 force link for Mac OS X builds

CMakeLists.txt

@@ -14,6 +14,14 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 
+if (UNIX)
+   if (APPLE)
+      if (LLVM_DIR STREQUAL "" OR NOT LLVM_DIR)
+         set(LLVM_DIR "/usr/local/Cellar/llvm@4/4.0.1/lib/cmake/llvm")
+      endif()
+   endif()
+endif()
+
 include( GNUInstallDirs )
 include( VersionMacros )
 include( SetupTargetMacros )

scripts/eosio_build_darwin.sh

@@ -159,7 +159,9 @@
 						printf "\\tExiting now.\\n\\n"
 						exit 1;
 					fi
-					if ! "${BREW}" unlink {DEP} && "${BREW}" link --force ${DEP}
+                                        if [[ "$DEP" == "llvm@4" ]]; then
+                                                "${BREW}" unlink ${DEP}
+					elif ! "${BREW}" unlink ${DEP} && "${BREW}" link --force ${DEP}
 					then
 						printf "\\tHomebrew exited with the above errors.\\n"
 						printf "\\tExiting now.\\n\\n"