Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r60479:0f2efc923987
Date: 2013-01-25 12:22 -0600
http://bitbucket.org/pypy/pypy/changeset/0f2efc923987/
Log: fix translating with an exe_name thats in a nested directory
diff --git a/pypy/module/sys/vm.py b/pypy/module/sys/vm.py
--- a/pypy/module/sys/vm.py
+++ b/pypy/module/sys/vm.py
@@ -95,7 +95,7 @@
def exc_info_with_tb(space):
operror = space.getexecutioncontext().sys_exc_info()
if operror is None:
- return space.newtuple([space.w_None,space.w_None,space.w_None])
+ return space.newtuple([space.w_None, space.w_None, space.w_None])
else:
return space.newtuple([operror.w_type, operror.get_w_value(space),
space.wrap(operror.get_traceback())])
diff --git a/rpython/translator/platform/posix.py
b/rpython/translator/platform/posix.py
--- a/rpython/translator/platform/posix.py
+++ b/rpython/translator/platform/posix.py
@@ -115,7 +115,7 @@
cflags = self.cflags + self.standalone_only
m = GnuMakefile(path)
- m.exe_name = exe_name
+ m.exe_name = path.join(target_name)
m.eci = eci
def rpyrel(fpath):
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -261,8 +261,15 @@
else:
exe_name = exe_name.new(ext=self.exe_ext)
+ if shared:
+ so_name = exe_name.new(purebasename='lib' + exe_name.purebasename,
+ ext=self.so_ext)
+ target_name = so_name.basename
+ else:
+ target_name = exe_name.basename
+
m = NMakefile(path)
- m.exe_name = exe_name
+ m.exe_name = path.join(target_name)
m.eci = eci
linkflags = list(self.link_flags)
@@ -274,13 +281,6 @@
# This is required for the JIT.
linkflags.append('/opt:noicf')
- if shared:
- so_name = exe_name.new(purebasename='lib' + exe_name.purebasename,
- ext=self.so_ext)
- target_name = so_name.basename
- else:
- target_name = exe_name.basename
-
def rpyrel(fpath):
rel = py.path.local(fpath).relto(rpypath)
if rel:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
