ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder x86_64 tests

Browse Source 
So that darwin and cygwin/mingw are tested before the generic check --
which allows them to actually be set.
This commit is contained in:
John Ralls
2013-01-26 15:21:14 -08:00
parent bada2e326d
commit bcc0c28001
2 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
configure vendored
View File

@@ -13285,6 +13285,7 @@ fi
TARGETDIR="unknown" TARGETDIR="unknown"
case "$host" in case "$host" in
aarch64*-*-*) aarch64*-*-*)
TARGET=AARCH64; TARGETDIR=aarch64 TARGET=AARCH64; TARGETDIR=aarch64
@@ -13365,6 +13366,23 @@ case "$host" in
fi fi
;; ;;
x86_64-*-darwin12.2.0)
TARGET=X86_DARWIN; TARGETDIR=x86
;;
x86_64-*-cygwin* | x86_64-*-mingw*)
TARGET=X86_WIN64; TARGETDIR=x86
# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
# We must also check with_cross_host to decide if this is a native
# or cross-build and select where to install dlls appropriately.
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
else
AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
fi
;;
i?86-*-* | x86_64-*-*) i?86-*-* | x86_64-*-*)
TARGETDIR=x86 TARGETDIR=x86
if test $ac_cv_sizeof_size_t = 4; then if test $ac_cv_sizeof_size_t = 4; then
@@ -13443,23 +13461,6 @@ case "$host" in
TARGET=TILE; TARGETDIR=tile TARGET=TILE; TARGETDIR=tile
;; ;;
x86_64-*-darwin*)
TARGET=X86_DARWIN; TARGETDIR=x86
;;
x86_64-*-cygwin* | x86_64-*-mingw*)
TARGET=X86_WIN64; TARGETDIR=x86
# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
# We must also check with_cross_host to decide if this is a native
# or cross-build and select where to install dlls appropriately.
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
else
AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
fi
;;
xtensa*-*) xtensa*-*)
TARGET=XTENSA; TARGETDIR=xtensa TARGET=XTENSA; TARGETDIR=xtensa
;; ;;

34
configure.ac
View File

@@ -146,6 +146,23 @@ case "$host" in
fi fi
;; ;;
x86_64-*-darwin*)
TARGET=X86_DARWIN; TARGETDIR=x86
;;
x86_64-*-cygwin* | x86_64-*-mingw*)
TARGET=X86_WIN64; TARGETDIR=x86
# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
# We must also check with_cross_host to decide if this is a native
# or cross-build and select where to install dlls appropriately.
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
else
AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
fi
;;
i?86-*-* | x86_64-*-*) i?86-*-* | x86_64-*-*)
TARGETDIR=x86 TARGETDIR=x86
if test $ac_cv_sizeof_size_t = 4; then if test $ac_cv_sizeof_size_t = 4; then
@@ -224,23 +241,6 @@ case "$host" in
TARGET=TILE; TARGETDIR=tile TARGET=TILE; TARGETDIR=tile
;; ;;
x86_64-*-darwin*)
TARGET=X86_DARWIN; TARGETDIR=x86
;;
x86_64-*-cygwin* | x86_64-*-mingw*)
TARGET=X86_WIN64; TARGETDIR=x86
# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
# We must also check with_cross_host to decide if this is a native
# or cross-build and select where to install dlls appropriately.
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
else
AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
fi
;;
xtensa*-*) xtensa*-*)
TARGET=XTENSA; TARGETDIR=xtensa TARGET=XTENSA; TARGETDIR=xtensa
;; ;;