| 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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 if test -z "$PYTHON_FOR_BUILD"; then | 475 if test -z "$PYTHON_FOR_BUILD"; then |
| 476 - for interp in python$PACKAGE_VERSION python2 python; do | 476 - for interp in python$PACKAGE_VERSION python2 python; do |
| 477 - which $interp >/dev/null 2>&1 || continue | 477 - which $interp >/dev/null 2>&1 || continue |
| 478 - if $interp -c 'import sys;sys.exit(not (sys.version_info[:2] >= (2,7
) and sys.version_info[0] < 3))'; then | 478 - if $interp -c 'import sys;sys.exit(not (sys.version_info[:2] >= (2,7
) and sys.version_info[0] < 3))'; then |
| 479 - break | 479 - break |
| 480 - fi | 480 - fi |
| 481 - interp= | 481 - interp= |
| 482 - done | 482 - done |
| 483 + case "$host" in | 483 + case "$host" in |
| 484 + *-*-nacl*) | 484 + *-*-nacl*) |
| 485 +» interp=$(cd ../build-nacl-host && pwd)/python.exe | 485 +» interp=$(cd ../../python-host/build_host && pwd)/python.exe |
| 486 +» if [ ! -f $interp ]; then interp=$(cd ../build-nacl-host && pwd)/pyt
hon; fi | 486 +» if [ ! -f $interp ]; then interp=$(cd ../../python-host/build_host &
& pwd)/python; fi |
| 487 + ;; | 487 + ;; |
| 488 + *) | 488 + *) |
| 489 + for interp in python$PACKAGE_VERSION python2 python; do | 489 + for interp in python$PACKAGE_VERSION python2 python; do |
| 490 + which $interp >/dev/null 2>&1 || continue | 490 + which $interp >/dev/null 2>&1 || continue |
| 491 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:
>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then | 491 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:
>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then |
| 492 + break | 492 + break |
| 493 + fi | 493 + fi |
| 494 + interp= | 494 + interp= |
| 495 + done | 495 + done |
| 496 + ;; | 496 + ;; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 if test -z "$PYTHON_FOR_BUILD"; then | 581 if test -z "$PYTHON_FOR_BUILD"; then |
| 582 - for interp in python$PACKAGE_VERSION python2 python; do | 582 - for interp in python$PACKAGE_VERSION python2 python; do |
| 583 - which $interp >/dev/null 2>&1 || continue | 583 - which $interp >/dev/null 2>&1 || continue |
| 584 - if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >
= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then | 584 - if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >
= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then |
| 585 - break | 585 - break |
| 586 - fi | 586 - fi |
| 587 - interp= | 587 - interp= |
| 588 - done | 588 - done |
| 589 + case "$host" in | 589 + case "$host" in |
| 590 + *-*-nacl*) | 590 + *-*-nacl*) |
| 591 +» interp=$(cd ../build-nacl-host && pwd)/python | 591 +» interp=$(cd ../../python-host/build_host && pwd)/python |
| 592 + ;; | 592 + ;; |
| 593 + *) | 593 + *) |
| 594 + for interp in python$PACKAGE_VERSION python2 python; do | 594 + for interp in python$PACKAGE_VERSION python2 python; do |
| 595 + which $interp >/dev/null 2>&1 || continue | 595 + which $interp >/dev/null 2>&1 || continue |
| 596 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:
>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then | 596 + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:
>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then |
| 597 + break | 597 + break |
| 598 + fi | 598 + fi |
| 599 + interp= | 599 + interp= |
| 600 + done | 600 + done |
| 601 + ;; | 601 + ;; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 OpenUNIX*|UnixWare*) | 655 OpenUNIX*|UnixWare*) |
| 656 @@ -2121,7 +2140,7 @@ then | 656 @@ -2121,7 +2140,7 @@ then |
| 657 LINKFORSHARED="-Wl,-E -Wl,+s";; | 657 LINKFORSHARED="-Wl,-E -Wl,+s";; |
| 658 # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; | 658 # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; |
| 659 BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; | 659 BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; |
| 660 - Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; | 660 - Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; |
| 661 + Linux*|GNU*|NaCl*) LINKFORSHARED="-Xlinker -export-dynamic";; | 661 + Linux*|GNU*|NaCl*) LINKFORSHARED="-Xlinker -export-dynamic";; |
| 662 # -u libsys_s pulls in all symbols in libsys | 662 # -u libsys_s pulls in all symbols in libsys |
| 663 Darwin/*) | 663 Darwin/*) |
| 664 # -u _PyMac_Error is needed to pull in the mac toolbox glue, | 664 # -u _PyMac_Error is needed to pull in the mac toolbox glue, |
| OLD | NEW |