Merge upstream

Author: synodriver

.gitignore

@@ -194,3 +194,4 @@ Temporary Items
 
 # Linux trash folder which might appear on any partition or disk
 .Trash-*
+dic.tar.gz

setup.py

@@ -93,11 +93,9 @@ def build_extensions(self):
     extra_compile_args = ["-fopenmp"]
     extra_link_args = ["-fopenmp"]
 elif system == "Darwin":
-    os.system("brew install llvm libomp")
-    os.system("brew install clang-omp")
-    # os.environ["CPP"] = "/usr/local/opt/llvm/bin/clang"
+    os.system("brew install libomp")
     extra_compile_args = ["-Xpreprocessor", "-fopenmp"]
-    extra_link_args = ["-Xpreprocessor", "-fopenmp"]
+    extra_link_args = ["-L/usr/local/lib", "-lomp"]
 else:
     extra_compile_args = ["-fopenmp"]
     extra_link_args = ["-fopenmp"]