From ce6ff822da66dda9db8d3255e78448754981b6e1 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Tue, 27 Jan 2009 09:53:43 +0000 Subject: [PATCH] Fix detection of i386 vs. x86_64 for -pc-solaris From #2951 --- config.guess | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/config.guess b/config.guess index 7b24a87..463a03a 100644 --- a/config.guess +++ b/config.guess @@ -337,7 +337,17 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \ + # bash is not able to generate correct code here + # i.e. it leaves \ns there + # so we need to use /usr/bin/echo to get what we want + # note that if config.guess is run by /bin/sh then + # this works as expected even without /usr/bin/echo + # but the problem is that configure is clever enough + # to find bash installed and then runs config.guess + # by bash instead of by /bin/sh + # It seems that using /usr/bin/echo here is the most + # portable Solaris fix + if /usr/bin/echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then -- 1.7.10.4