Author: Manuel Jacob <m...@manueljacob.de>
Branch: llvm-translation-backend
Changeset: r80827:7557812bafd4
Date: 2015-11-20 00:22 +0100
http://bitbucket.org/pypy/pypy/changeset/7557812bafd4/
Log: hg merge default
diff --git a/pypy/goal/targetpypystandalone.py
b/pypy/goal/targetpypystandalone.py
--- a/pypy/goal/targetpypystandalone.py
+++ b/pypy/goal/targetpypystandalone.py
@@ -302,7 +302,7 @@
def hack_for_cffi_modules(self, driver):
# HACKHACKHACK
- # ugly hack to modify target goal from compile_c to build_cffi_imports
+ # ugly hack to modify target goal from compile_* to build_cffi_imports
# this should probably get cleaned up and merged with driver.create_exe
from rpython.translator.driver import taskdef
import types
@@ -316,7 +316,8 @@
name = name.new(ext='exe')
return name
- @taskdef(['compile_c'], "Create cffi bindings for modules")
+ compile_goal, = driver.backend_select_goals(['compile'])
+ @taskdef([compile_goal], "Create cffi bindings for modules")
def task_build_cffi_imports(self):
from pypy.tool.build_cffi_imports import
create_cffi_import_libraries
''' Use cffi to compile cffi interfaces to modules'''
@@ -335,7 +336,7 @@
# if failures, they were already printed
print >> sys.stderr, str(exename),'successfully built, but errors
while building the above modules will be ignored'
driver.task_build_cffi_imports =
types.MethodType(task_build_cffi_imports, driver)
- driver.tasks['build_cffi_imports'] = driver.task_build_cffi_imports,
['compile_c']
+ driver.tasks['build_cffi_imports'] = driver.task_build_cffi_imports,
[compile_goal]
driver.default_goal = 'build_cffi_imports'
# HACKHACKHACK end
diff --git a/rpython/translator/platform/darwin.py
b/rpython/translator/platform/darwin.py
--- a/rpython/translator/platform/darwin.py
+++ b/rpython/translator/platform/darwin.py
@@ -28,11 +28,11 @@
# needed for cross compiling on ARM, needs fixing if relevant for
darwin
if len(rel_libdirs) > 0:
print 'in get_rpath_flags, rel_libdirs is not fixed up',rel_libdirs
- return self.rpath_flags
+ return self.rpath_flags
def _args_for_shared(self, args):
return (list(self.shared_only)
- + ['-dynamiclib', '-install_name', '@rpath/$(TARGET)',
'-undefined', 'dynamic_lookup']
+ + ['-dynamiclib', '-install_name', '@rpath/$(TARGET)',
'-undefined', 'dynamic_lookup', '-flat_namespace']
+ args)
def _include_dirs_for_libffi(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
