diff options
| author | John Ralls <jralls@ceridwen.us> | 2013-01-26 15:21:14 -0800 |
|---|---|---|
| committer | John Ralls <jralls@ceridwen.us> | 2013-01-26 15:26:01 -0800 |
| commit | bcc0c28001b6d427d5cd8037d2e3c892babc6b4c (patch) | |
| tree | da9369db4eaff0af78ab4a418cb49d0b99dfb771 | |
| parent | bada2e326d9a9acf3ae40cfa4f5d7a9ba97b2ea8 (diff) | |
| download | libffi-bcc0c28001b6d427d5cd8037d2e3c892babc6b4c.tar.gz | |
Reorder x86_64 tests
So that darwin and cygwin/mingw are tested before the generic check --
which allows them to actually be set.
| -rwxr-xr-x | configure | 35 | ||||
| -rw-r--r-- | configure.ac | 34 |
2 files changed, 35 insertions, 34 deletions
@@ -13285,6 +13285,7 @@ fi TARGETDIR="unknown" + case "$host" in aarch64*-*-*) TARGET=AARCH64; TARGETDIR=aarch64 @@ -13365,6 +13366,23 @@ case "$host" in 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-*-*) TARGETDIR=x86 if test $ac_cv_sizeof_size_t = 4; then @@ -13443,23 +13461,6 @@ case "$host" in 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*-*) TARGET=XTENSA; TARGETDIR=xtensa ;; diff --git a/configure.ac b/configure.ac index 5d61007..e25b6e9 100644 --- a/configure.ac +++ b/configure.ac @@ -146,6 +146,23 @@ case "$host" in 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-*-*) TARGETDIR=x86 if test $ac_cv_sizeof_size_t = 4; then @@ -224,23 +241,6 @@ case "$host" in 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*-*) TARGET=XTENSA; TARGETDIR=xtensa ;; |