Fix build on x32
This commit is contained in:
parent
55372af684
commit
282ebc6dbd
|
@ -59,5 +59,5 @@ EXTRA_DIST = nasm_lt.sh
|
|||
#x86_64 only
|
||||
if USE_ASM
|
||||
.asm.lo:
|
||||
$(LIBTOOL) --mode=compile --tag YASM $(srcdir)/nasm_lt.sh $(YASM) -f elf64 $(YAFLAGS) -I$(srcdir) -I. $< -o $@
|
||||
$(LIBTOOL) --mode=compile --tag YASM $(srcdir)/nasm_lt.sh $(YASM) -f $(YASM_BINFMT) $(YAFLAGS) -I$(srcdir) -I. $< -o $@
|
||||
endif
|
||||
|
|
19
configure.ac
19
configure.ac
|
@ -73,7 +73,23 @@ if test x$YASM = x; then
|
|||
fi
|
||||
has_64bit_asm=no
|
||||
else
|
||||
has_64bit_asm=yes
|
||||
case x"$host_os" in
|
||||
x*-gnux32)
|
||||
YASM_BINFMT=elfx32
|
||||
;;
|
||||
*)
|
||||
YASM_BINFMT=elf64
|
||||
;;
|
||||
esac
|
||||
if $YASM -f help | grep -q $YASM_BINFMT; then
|
||||
has_64bit_asm=yes
|
||||
else
|
||||
if test x"$set_field" = x"64bit_asm"; then
|
||||
AC_MSG_ERROR([$set_field field support explicitly requested but yasm doesn't support $YASM_BINFMT format])
|
||||
fi
|
||||
AC_MSG_WARN([yasm too old for $YASM_BINFMT format])
|
||||
has_64bit_asm=no
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
|
@ -273,6 +289,7 @@ AC_SUBST(SECP_INCLUDES)
|
|||
AC_SUBST(SECP_LIBS)
|
||||
AC_SUBST(SECP_TEST_LIBS)
|
||||
AC_SUBST(SECP_TEST_INCLUDES)
|
||||
AC_SUBST(YASM_BINFMT)
|
||||
AM_CONDITIONAL([USE_ASM], [test x"$set_field" == x"64bit_asm"])
|
||||
AM_CONDITIONAL([USE_TESTS], [test x"$use_tests" != x"no"])
|
||||
AM_CONDITIONAL([USE_BENCHMARK], [test x"$use_benchmark" != x"no"])
|
||||
|
|
Loading…
Reference in New Issue