Commit 45fda238 authored by John Zhang's avatar John Zhang

add option to specify to which directory libpypy_mu_support.dylib should be...

add option to specify to which directory libpypy_mu_support.dylib should be genreated; uncomment setting support lib to holstein in genmu.py
parent 08b0500e
......@@ -294,6 +294,8 @@ translation_optiondescription = OptionDescription(
BoolOption("testjit", "Generate code suitable for testing Mu JIT",
requires=[('translation.mu.impl', 'zebu')],
default=False, cmdline="--mu-zebu-testjit"),
StrOption("suplibdir", "Directory to which libpypy_mu_support.so is to be placed.",
default=".", cmdline="--mu-suplibdir"),
StrOption("vmargs", "MuVM option string",
default='', cmdline="--mu-vmargs"),
BoolOption("no_ovf", "Assume all arithematic operations never overflow, "
......
......@@ -3,6 +3,8 @@ from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.translator.mu import mutype
from rpython.translator.platform import platform
from rpython.tool.udir import udir
from rpython.config.translationoption import get_translation_config
import ctypes, ctypes.util
import os, sys, py, re
......@@ -215,7 +217,8 @@ class MuDatabase:
if eci.libraries:
# NOTE: move compiled library to be under current dir
libpath = py.path.local(eci.libraries[-1])
targetpath = py.path.local().join(libpath.basename)
suplibdir = get_translation_config().translation.mu.suplibdir
targetpath = py.path.local(suplibdir).join(libpath.basename)
libpath.move(targetpath)
self.libsupport_path = targetpath
eci.libraries = eci.libraries[:-1] + (targetpath.strpath, )
......
......@@ -27,7 +27,7 @@ class MuBundleGen:
self.db = db
self.idmap = {}
self.rmu = get_rmu()
if hasattr(self.rmu, 'get_global_apilogger'):
self.rmu.get_global_apilogger().clear() # clear API logger over continuous test runs
......@@ -214,7 +214,7 @@ class MuBundleGen:
# in conformity to the assumption of pypy interpreter that the final product is executable
import stat
py.path.local(targetname).chmod(stat.S_IRWXU)
return self.db, self, self.db.tlc.entry_point_graph.name
def gen_types(self):
......
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