Skip to content

Commit

Permalink
javac_command fix
Browse files Browse the repository at this point in the history
  • Loading branch information
0x00b1 committed Sep 23, 2019
1 parent c7ccaed commit 7cd83b7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def build_cython():
pyx for pyx, c in zip(pyx_filenames, c_filenames)
if os.path.exists(pyx) and needs_compilation(c, pyx)]
if len(nc_pyx_filenames) > 0:
cython_cmd = [sys.executable, '-m', 'cython', "-3"]
cython_cmd = [sys.executable, '-m', 'cython']
cmd = cython_cmd + nc_pyx_filenames
env = dict(os.environ)
env['PYTHONPATH'] = os.pathsep.join(sys.path)
Expand Down Expand Up @@ -97,7 +97,8 @@ def ext_modules():
if java_home is None:
raise Exception("JVM not found")
jdk_home = find_jdk()
include_dirs = get_jvm_include_dirs()
from numpy import get_include
include_dirs = [get_include()] + get_jvm_include_dirs()
libraries = None
library_dirs = None
javabridge_sources = ['_javabridge.c']
Expand Down Expand Up @@ -220,7 +221,7 @@ def build_jar_from_sources(self, jar, sources):

javac_loc = find_javac_cmd()
dirty_jar = False
javac_command = [javac_loc]
javac_command = [javac_loc, "-source", "8", "-target", "8"]
for source in sources:
javac_command.append(package_path(source))
if needs_compilation(jar, source):
Expand Down

0 comments on commit 7cd83b7

Please sign in to comment.