Move OSX fix into fugashi_util

polm · Apr 2, 2020 · f32a184 · f32a184
1 parent 6f2e0df
commit f32a184
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/fugashi_util.py b/fugashi_util.py
@@ -73,7 +73,7 @@ def mecab_config_linux_build():
         os.chdir(base_dir)
         data_files = [(lib_dir, glob.glob(src_dir + "/.libs/libmecab.*"))]
     if platform.platform().startswith("Darwin"):
-        lib_arg = "-rpath {}".format(lib_dir)
+        lib_arg = "-rpath {} -stdlib=libc++ -mmacosx-version-min=10.9".format(lib_dir)
     else:
         lib_arg = "-Wl,-rpath={}".format(lib_dir)
     mecab_details = (src_dir, src_dir, 'mecab stdc++', lib_arg)

diff --git a/setup.py b/setup.py
@@ -17,10 +17,6 @@
 extra_objects = mecab_config[3].split()
 extra_link_args = mecab_config[4].split()
 
-import platform
-if platform.platform().startswith("Darwin"):
-    extra_link_args = ["-stdlib=libc++", "-mmacosx-version-min=10.9"]
-
 extensions = Extension('fugashi', 
         ['fugashi/fugashi.pyx'], 
         libraries=libraries,