Skip to content

Commit

Permalink
build: Fix platform detection on FreeBSD
Browse files Browse the repository at this point in the history
Look for amd64 in addition to x86_64 as the platform
type for x86_64 assembly.  The FreeBSD-packaged
Autoconf package has a patch to return
amd64-unknown-freebsd11.0 instead of the
x86_64-unknown-freebsd11.0 that a stock Autoconf
package would return.  Since we want to run Jenkins
builds on FreeBSD, working around the FreeBSD patch
is probably the easiest thing.

Signed-off-by: Brian Barrett <[email protected]>
  • Loading branch information
bwbarrett committed Apr 10, 2017
1 parent 38c9eb9 commit d6a9725
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ Copyright (c) 2014-2015 Hewlett-Packard Development Company, LP. All
rights reserved.
Copyright (c) 2013-2017 Research Organization for Information Science (RIST).
All rights reserved.
Copyright (c) 2017 Amazon.com, Inc. or its affiliates. All Rights
reserved.

$COPYRIGHT$

Expand Down
4 changes: 3 additions & 1 deletion config/opal_config_asm.m4
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ dnl Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
dnl Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
dnl Copyright (c) 2015-2017 Research Organization for Information Science
dnl and Technology (RIST). All rights reserved.
dnl Copyright (c) 2017 Amazon.com, Inc. or its affiliates. All Rights
dnl reserved.
dnl $COPYRIGHT$
dnl
dnl Additional copyrights may follow
Expand Down Expand Up @@ -908,7 +910,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
OPAL_GCC_INLINE_ASSIGN=""
OPAL_ASM_SUPPORT_64BIT=0
case "${host}" in
i?86-*|x86_64*)
i?86-*|x86_64*|amd64*)
if test "$ac_cv_sizeof_long" = "4" ; then
opal_cv_asm_arch="IA32"
else
Expand Down

0 comments on commit d6a9725

Please sign in to comment.