Commit 71ec9922 authored by Javad Ebrahimian Amiri's avatar Javad Ebrahimian Amiri

Merge branch 'revert-aa695c46' into 'mu-rewrite'

Revert "Modified some lib directories"

See merge request !2
parents 21f920b2 0ad046d4
......@@ -14,7 +14,7 @@ from rpython.tool.ansi_print import AnsiLogger
logger = AnsiLogger('ZebuPyAPI')
zebu_build = os.environ.get('ZEBU_BUILD', 'release')
libmu_dir = os.path.join(os.getenv('MU_ZEBU'), 'target', zebu_build, 'deps')
libmu_dir = os.path.join(os.getenv('MU_ZEBU'), 'target', zebu_build)
eci = ExternalCompilationInfo(libraries=['mu'],
library_dirs=[libmu_dir])
......
......@@ -226,7 +226,7 @@ class APILogger:
defs = [
('OBJECTS', ' '.join(['file_%d.o' % i for i in range(num_c_files)]) + ' main.o'),
('INCLUDEDIRS', '-I$(MU_ZEBU)/src/vm/api'),
('LIBDIRS', '-L$(MU_ZEBU)/target/%s/deps' % os.environ.get('ZEBU_BUILD', 'release')),
('LIBDIRS', '-L$(MU_ZEBU)/target/%s' % os.environ.get('ZEBU_BUILD', 'release')),
('LIBS', '-lmu'),
('TARGET', target),
('CC', platform.cc),
......
......@@ -743,7 +743,7 @@ class APILogger:
""" % {
'include_dir': '$(MU_HOLSTEIN)/cbinding' if opts.impl == 'ref' else '$(MU_ZEBU)/src/vm/api',
'link_dir': '$(MU_HOLSTEIN)/cbinding' if opts.impl == 'ref' else '$(MU_ZEBU)/target/debug/deps',
'link_dir': '$(MU_HOLSTEIN)/cbinding' if opts.impl == 'ref' else '$(MU_ZEBU)/target/debug',
'libmu': 'murefimpl2start' if opts.impl == 'ref' else 'mu'
})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment