Skip to content

Commit

Permalink
Merge pull request ceph#9766 from dx9/wip-autotools-arch
Browse files Browse the repository at this point in the history
configure.ac: Use uname instead of arch.

Reviewed-by: Willem Jan Withagen <[email protected]>
  • Loading branch information
tchaikov authored Jul 4, 2016
2 parents ed47363 + 6cb0657 commit 873aba7
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -244,14 +244,7 @@ AC_CHECK_PROG(YASM_CHECK, yasm, yes)
if test x"$YASM_CHECK" = x"yes"; then
if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then
echo 'we have a modern and working yasm'
# FreeBSD has uname -p not arch(1), so do not exec arch
arch_x86_64=0
if test x`uname -p`x = x"amd64"x ; then
arch_x86_64=1
elif which arch 2>&1 > /dev/null; then
test x`arch`x = x"x86_64"x && arch_x86_64=1
fi
if test $arch_x86_64 -eq 1 ; then
if test x`uname -m`x = x"x86_64"x || test x`uname -m`x = x"amd64"x; then
echo 'we are x86_64'
arch_x32=0
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
Expand Down

0 comments on commit 873aba7

Please sign in to comment.