Author: Ronny Pfannschmidt <ronny.pfannschm...@gmx.de>
Branch:
Changeset: r45849:cededc37c18e
Date: 2011-07-22 00:22 +0200
http://bitbucket.org/pypy/pypy/changeset/cededc37c18e/
Log: merge
diff --git a/lib-python/modified-2.7/distutils/sysconfig_pypy.py
b/lib-python/modified-2.7/distutils/sysconfig_pypy.py
--- a/lib-python/modified-2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/modified-2.7/distutils/sysconfig_pypy.py
@@ -116,6 +116,12 @@
if compiler.compiler_type == "unix":
compiler.compiler_so.extend(['-fPIC', '-Wimplicit'])
compiler.shared_lib_extension = get_config_var('SO')
+ if "CFLAGS" in os.environ:
+ cflags = os.environ["CFLAGS"]
+ compiler.compiler.append(cflags)
+ compiler.compiler_so.append(cflags)
+ compiler.linker_so.append(cflags)
+
from sysconfig_cpython import (
parse_makefile, _variable_rx, expand_makefile_vars)
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -259,8 +259,8 @@
i = start
j = 0
while i < stop:
- slice_driver1.jit_merge_point(signature=arr.signature,
- step=step, stop=stop, i=i, j=j, arr=arr, storage=storage)
+ #slice_driver1.jit_merge_point(signature=arr.signature,
+ # step=step, stop=stop, i=i, j=j, arr=arr, storage=storage)
storage[i] = arr.eval(j)
j += 1
i += step
@@ -269,8 +269,8 @@
i = start
j = 0
while i > stop:
- slice_driver2.jit_merge_point(signature=arr.signature,
- step=step, stop=stop, i=i, j=j, arr=arr, storage=storage)
+ #slice_driver2.jit_merge_point(signature=arr.signature,
+ # step=step, stop=stop, i=i, j=j, arr=arr, storage=storage)
storage[i] = arr.eval(j)
j += 1
i += step
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
