[pypy-commit] pypy default: more quite trivial win64 changes

[ctismer]

Author: Christian Tismer <tismer at stackless.com>
Branch: 
Changeset: r53737:efcea6db43f3
Date: 2012-03-16 17:00 -0700
http://bitbucket.org/pypy/pypy/changeset/efcea6db43f3/

Log:	more quite trivial win64 changes

diff --git a/pypy/rpython/test/test_rptr.py b/pypy/rpython/test/test_rptr.py
--- a/pypy/rpython/test/test_rptr.py
+++ b/pypy/rpython/test/test_rptr.py
@@ -5,6 +5,7 @@
 from pypy.rpython.lltypesystem import llmemory
 from pypy.rpython.rtyper import RPythonTyper
 from pypy.annotation import model as annmodel
+from pypy.rlib.rarithmetic import is_valid_int
 
 
 # ____________________________________________________________
@@ -188,7 +189,7 @@
             return llmemory.cast_adr_to_int(a, "forced")
 
     res = interpret(fn, [2])
-    assert type(res) is int
+    assert is_valid_int(res)
     assert res == cast_ptr_to_int(p)
     #
     res = interpret(fn, [4])
@@ -196,7 +197,7 @@
     assert llmemory.cast_int_to_adr(res) == llmemory.cast_ptr_to_adr(p)
     #
     res = interpret(fn, [6])
-    assert type(res) is int
+    assert is_valid_int(res)
     from pypy.rpython.lltypesystem import rffi
     assert res == rffi.cast(Signed, p)
 
diff --git a/pypy/rpython/tool/rffi_platform.py b/pypy/rpython/tool/rffi_platform.py
--- a/pypy/rpython/tool/rffi_platform.py
+++ b/pypy/rpython/tool/rffi_platform.py
@@ -710,9 +710,13 @@
 PYPY_EXTERNAL_DIR = py.path.local(pypydir).join('..', '..')
 # XXX make this configurable
 if sys.platform == 'win32':
-    libdir = py.path.local('c:/buildslave/support') # on the bigboard buildbot
-    if libdir.check():
-        PYPY_EXTERNAL_DIR = libdir
+    for libdir in [
+        py.path.local('c:/buildslave/support'), # on the bigboard buildbot
+        py.path.local('d:/myslave'), # on the snakepit buildbot
+        ]:
+        if libdir.check():
+            PYPY_EXTERNAL_DIR = libdir
+            break
 
 def configure_external_library(name, eci, configurations,
                                symbol=None, _cache={}):
@@ -790,9 +794,15 @@
     if platform is None:
         from pypy.translator.platform import platform
     if sys.platform == 'win32':
-        library_dir = 'Release'
-        libraries = ['gc']
-        includes=['gc.h']
+        import platform as host_platform # just to ask for the arch. Confusion-alert!
+        if host_platform.architecture()[0] == '32bit':
+            library_dir = 'Release'
+            libraries = ['gc']
+            includes=['gc.h']
+        else:
+            library_dir = ''
+            libraries = ['gc64_dll']
+            includes = ['gc.h']
     else:
         library_dir = ''
         libraries = ['gc', 'dl']