OLD | NEW |
1 diff --git a/Include/datetime.h b/Include/datetime.h | 1 diff --git a/Include/datetime.h b/Include/datetime.h |
2 index c0e7ffd..b6d6036 100644 | 2 index c0e7ffd..b6d6036 100644 |
3 --- a/Include/datetime.h | 3 --- a/Include/datetime.h |
4 +++ b/Include/datetime.h | 4 +++ b/Include/datetime.h |
5 @@ -166,6 +166,8 @@ typedef struct { | 5 @@ -166,6 +166,8 @@ typedef struct { |
6 | 6 |
7 #ifdef Py_BUILD_CORE | 7 #ifdef Py_BUILD_CORE |
8 | 8 |
9 +#define PyDataTime_STATIC 1 | 9 +#define PyDataTime_STATIC 1 |
10 + | 10 + |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
452 if test -z "$PYTHON_FOR_BUILD"; then | 452 if test -z "$PYTHON_FOR_BUILD"; then |
453 - for interp in python$PACKAGE_VERSION python2 python; do | 453 - for interp in python$PACKAGE_VERSION python2 python; do |
454 - which $interp >/dev/null 2>&1 || continue | 454 - which $interp >/dev/null 2>&1 || continue |
455 - if $interp -c 'import sys;sys.exit(not (sys.version_info[:2] >= (2,7
) and sys.version_info[0] < 3))'; then | 455 - if $interp -c 'import sys;sys.exit(not (sys.version_info[:2] >= (2,7
) and sys.version_info[0] < 3))'; then |
456 - break | 456 - break |
457 - fi | 457 - fi |
458 - interp= | 458 - interp= |
459 - done | 459 - done |
460 + case "$host" in | 460 + case "$host" in |
461 + *-*-nacl*) | 461 + *-*-nacl*) |
462 +» interp=$(cd ../build-nacl-host && pwd)/python.exe | 462 +» interp=$(cd ../build_host && pwd)/python.exe |
463 +» if [ ! -f $interp ]; then interp=$(cd ../build-nacl-host && pwd)/pyt
hon; fi | 463 +» if [ ! -f $interp ]; then interp=$(cd ../build_host && pwd)/python;
fi |
464 + ;; | 464 + ;; |
465 + *) | 465 + *) |
466 + for interp in python$PACKAGE_VERSION python2 python; do | 466 + for interp in python$PACKAGE_VERSION python2 python; do |
467 + which $interp >/dev/null 2>&1 || continue | 467 + which $interp >/dev/null 2>&1 || continue |
468 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:
>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then | 468 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:
>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then |
469 + break | 469 + break |
470 + fi | 470 + fi |
471 + interp= | 471 + interp= |
472 + done | 472 + done |
473 + ;; | 473 + ;; |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 if test -z "$PYTHON_FOR_BUILD"; then | 545 if test -z "$PYTHON_FOR_BUILD"; then |
546 - for interp in python$PACKAGE_VERSION python2 python; do | 546 - for interp in python$PACKAGE_VERSION python2 python; do |
547 - which $interp >/dev/null 2>&1 || continue | 547 - which $interp >/dev/null 2>&1 || continue |
548 - if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >
= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then | 548 - if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >
= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then |
549 - break | 549 - break |
550 - fi | 550 - fi |
551 - interp= | 551 - interp= |
552 - done | 552 - done |
553 + case "$host" in | 553 + case "$host" in |
554 + *-*-nacl*) | 554 + *-*-nacl*) |
555 +» interp=$(cd ../build-nacl-host && pwd)/python | 555 +» interp=$(cd ../build_host && pwd)/python |
556 + ;; | 556 + ;; |
557 + *) | 557 + *) |
558 + for interp in python$PACKAGE_VERSION python2 python; do | 558 + for interp in python$PACKAGE_VERSION python2 python; do |
559 + which $interp >/dev/null 2>&1 || continue | 559 + which $interp >/dev/null 2>&1 || continue |
560 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:
>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then | 560 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:
>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then |
561 + break | 561 + break |
562 + fi | 562 + fi |
563 + interp= | 563 + interp= |
564 + done | 564 + done |
565 + ;; | 565 + ;; |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
634 version = line.split()[2] | 634 version = line.split()[2] |
635 break | 635 break |
636 if version >= version_req: | 636 if version >= version_req: |
637 - if (self.compiler.find_library_file(lib_dirs, 'z')): | 637 - if (self.compiler.find_library_file(lib_dirs, 'z')): |
638 + # Unconditionally try to link zlib. | 638 + # Unconditionally try to link zlib. |
639 + # Changing the library path seems to provoke other issues. | 639 + # Changing the library path seems to provoke other issues. |
640 + if True or (self.compiler.find_library_file(lib_dirs, 'z')): | 640 + if True or (self.compiler.find_library_file(lib_dirs, 'z')): |
641 if host_platform == "darwin": | 641 if host_platform == "darwin": |
642 zlib_extra_link_args = ('-Wl,-search_paths_first',) | 642 zlib_extra_link_args = ('-Wl,-search_paths_first',) |
643 else: | 643 else: |
OLD | NEW |