avoid hardcoded paths in configure script

Allows calling configure with custom libxdc/capstone locations
This commit is contained in:
Steffen Schulz 2022-04-27 00:45:39 +02:00
parent 5846b4b094
commit c3bbf86ddd
2 changed files with 11 additions and 2 deletions

View File

@ -59,6 +59,16 @@ configure_qemu()
{
QEMU_CONFIGURE="./configure --target-list=x86_64-softmmu --disable-gtk --disable-docs --enable-gtk --disable-werror --disable-capstone --disable-libssh --disable-tools"
case $1 in
"debug_static"|"static"|"lto")
export LIBS="-L$PWD/capstone_v4/ -L$PWD/libxdc/ $LIBS"
export QEMU_CFLAGS="-I$PWD/capstone_v4/include/ -I$PWD/libxdc/ $QEMU_CFLAGS"
;;
*)
error
;;
esac
case $1 in
"dynamic")
$QEMU_CONFIGURE --enable-nyx

3
configure vendored
View File

@ -6105,8 +6105,7 @@ if test "$nyx" = "yes" ; then
CFLAGS="-DNESTED_PATCH -Wno-error=maybe-uninitialized -DQEMU_NYX -g -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
if test "$nyx_static" = "yes" ; then
LIBS="-L$PWD/capstone_v4/ -l:libcapstone.a -L$PWD/libxdc/ -l:libxdc.a -I$PWD/capstone_v4/include/ -I$PWD/libxdc/ $LIBS"
QEMU_INCLUDES=" -I$PWD/capstone_v4/include/ -I$PWD/libxdc/ $QEMU_INCLUDES"
LIBS="-l:libcapstone.a -l:libxdc.a $LIBS"
else
LIBS="-lcapstone -lxdc $LIBS"
fi