projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
20f7061
)
Fixed yasm/nasm compilation on x86_64.
author
Pekka Riikonen
<priikone@silcnet.org>
Sat, 15 Sep 2007 07:07:46 +0000
(07:07 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Sat, 15 Sep 2007 07:07:46 +0000
(07:07 +0000)
configure.ad
patch
|
blob
|
history
diff --git
a/configure.ad
b/configure.ad
index 8ee9d61b87f5e4e494e6f19de149346b9fd56ebb..1ede5e3075984a99ebfb9a3b94fcd1113f876c87 100644
(file)
--- a/
configure.ad
+++ b/
configure.ad
@@
-361,13
+361,21
@@
have_assembler=false
if test x$want_asm = xtrue; then
AC_PATH_PROG([NASM], [nasm], [no])
if test "x$NASM" != "xno"; then
if test x$want_asm = xtrue; then
AC_PATH_PROG([NASM], [nasm], [no])
if test "x$NASM" != "xno"; then
- SILC_ASSEMBLER="$NASM -O2 -felf"
+ if test x$cpu_x86_64 = xtrue; then
+ SILC_ASSEMBLER="$NASM -O2 -felf64"
+ else
+ SILC_ASSEMBLER="$NASM -O2 -felf"
+ fi
have_assembler=true
fi
AC_PATH_PROG([YASM], [yasm], [no])
if test "x$YASM" != "xno"; then
have_assembler=true
fi
AC_PATH_PROG([YASM], [yasm], [no])
if test "x$YASM" != "xno"; then
- SILC_ASSEMBLER="$YASM -Xgnu -felf"
+ if test x$cpu_x86_64 = xtrue; then
+ SILC_ASSEMBLER="$YASM -Xgnu -felf64"
+ else
+ SILC_ASSEMBLER="$YASM -Xgnu -felf64"
+ fi
have_assembler=true
fi
fi
have_assembler=true
fi
fi