[commit: ghc] ghc-8.2: aclocal.m4: allow arbitrary <vendor> string in toolchain triplets (afec638)

git at git.haskell.org git at git.haskell.org
Sat Jul 22 21:21:03 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/afec638e93b77c183c6e9dd4b5fe7d4d2ba41fb6/ghc

>---------------------------------------------------------------

commit afec638e93b77c183c6e9dd4b5fe7d4d2ba41fb6
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Sat Jul 8 09:47:12 2017 +0100

    aclocal.m4: allow arbitrary <vendor> string in toolchain triplets
    
    Canonical triplets have a form of
        <arch>-<vendor>-<os>[-<abi>]
    
    Checking for vendor is almost never correct as it's an
    arbitrary string.
    
    It's useful to have multiple "vendors" to denote
    otherwise the same (WRT <arch>, <os>, <abi>) target:
        --target=x86_64-pc-linux-gnu
        --target=x86_64-unknown-linux-gnu
        --target=x86_64-ghc80-linux-gnu
        --target=x86_64-ghchead-linux-gnu
    
    Do not fail unknown vendors. Only emit a warning.
    Ideally configure checks should never use "vendor".
    
    Signed-off-by: Sergei Trofimovich <slyfox at gentoo.org>
    (cherry picked from commit c2303dff95aa174021a1950656fdf9a1cf983959)


>---------------------------------------------------------------

afec638e93b77c183c6e9dd4b5fe7d4d2ba41fb6
 aclocal.m4 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 79067eb..fe2c43d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -231,8 +231,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         dec|none|unknown|hp|apple|next|sun|sgi|ibm|montavista|portbld)
             ;;
         *)
-            echo "Unknown vendor [$]1"
-            exit 1
+            AC_MSG_WARN([Unknown vendor [$]1])
             ;;
         esac
     }



More information about the ghc-commits mailing list