[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/46] configure: do not include absolute paths in -I and -L paths
From: |
Paolo Bonzini |
Subject: |
[PULL 09/46] configure: do not include absolute paths in -I and -L paths |
Date: |
Fri, 4 Sep 2020 07:40:45 -0400 |
On msys2, paths such as -L/e/path/to/qemu are not recognized by
the linker. Fortunately we do not need absolute paths at all in a
non-recursive build system.
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index f555923311..644e2c923d 100755
--- a/configure
+++ b/configure
@@ -943,7 +943,7 @@ Linux)
linux="yes"
linux_user="yes"
kvm="yes"
- QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I$PWD/linux-headers
$QEMU_INCLUDES"
+ QEMU_INCLUDES="-isystem ${source_path}/linux-headers -Ilinux-headers
$QEMU_INCLUDES"
libudev="yes"
;;
esac
@@ -4265,7 +4265,7 @@ EOF
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
fi
fdt_cflags="-I${source_path}/dtc/libfdt"
- fdt_ldflags="-L$PWD/dtc/libfdt"
+ fdt_ldflags="-Ldtc/libfdt"
fdt_libs="$fdt_libs"
elif test "$fdt" = "yes" ; then
# Not a git build & no libfdt found, prompt for system install
@@ -5250,7 +5250,7 @@ case "$capstone" in
else
LIBCAPSTONE=libcapstone.a
fi
- capstone_libs="-L$PWD/capstone -lcapstone"
+ capstone_libs="-Lcapstone -lcapstone"
capstone_cflags="-I${source_path}/capstone/include"
;;
@@ -6250,8 +6250,8 @@ case "$slirp" in
git_submodules="${git_submodules} slirp"
fi
mkdir -p slirp
- slirp_cflags="-I${source_path}/slirp/src -I$PWD/slirp/src"
- slirp_libs="-L$PWD/slirp -lslirp"
+ slirp_cflags="-I${source_path}/slirp/src -Islirp/src"
+ slirp_libs="-Lslirp -lslirp"
if test "$mingw32" = "yes" ; then
slirp_libs="$slirp_libs -lws2_32 -liphlpapi"
fi
--
2.26.2
- [PULL 00/46] Next round of Meson bugfixes and cleanups, Paolo Bonzini, 2020/09/04
- [PULL 02/46] tests/Makefile: test-image-locking needs CONFIG_POSIX, Paolo Bonzini, 2020/09/04
- [PULL 01/46] qemu-iotests: move check-block back to Makefiles, Paolo Bonzini, 2020/09/04
- [PULL 08/46] meson: remove b_lundef option, Paolo Bonzini, 2020/09/04
- [PULL 06/46] mtest2make: hide output of successful tests, Paolo Bonzini, 2020/09/04
- [PULL 04/46] mtest2make: split environment from test command, Paolo Bonzini, 2020/09/04
- [PULL 09/46] configure: do not include absolute paths in -I and -L paths,
Paolo Bonzini <=
- [PULL 16/46] meson: convert qht-bench, Paolo Bonzini, 2020/09/04
- [PULL 14/46] meson: declare tasn1 dependency, Paolo Bonzini, 2020/09/04
- [PULL 07/46] mtest2make: unify tests that appear in multiple suites, Paolo Bonzini, 2020/09/04
- [PULL 13/46] meson: build qapi tests library, Paolo Bonzini, 2020/09/04
- [PULL 12/46] meson: fix libqos linking, Paolo Bonzini, 2020/09/04
- [PULL 10/46] configure: include cross sdl2-config in meson cross file, Paolo Bonzini, 2020/09/04
- [PULL 17/46] meson: convert the unit tests, Paolo Bonzini, 2020/09/04
- [PULL 20/46] meson: convert vhost-user-bridge, Paolo Bonzini, 2020/09/04
- [PULL 15/46] meson: declare keyutils dependency, Paolo Bonzini, 2020/09/04
- [PULL 05/46] mtest2make: split working directory from test command, Paolo Bonzini, 2020/09/04