[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/39] configure: do not include absolute paths in -I and -L path
From: |
Paolo Bonzini |
Subject: |
[PATCH 07/39] configure: do not include absolute paths in -I and -L paths |
Date: |
Wed, 2 Sep 2020 08:58: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 b58627f4aa..131a9e518b 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
- [PATCH 00/39] Next round of Meson fixes and cleanups, Paolo Bonzini, 2020/09/02
- [PATCH 01/39] configure: Add system = 'linux' for meson when cross-compiling, Paolo Bonzini, 2020/09/02
- [PATCH 02/39] mtest2make: split environment from test command, Paolo Bonzini, 2020/09/02
- [PATCH 03/39] mtest2make: split working directory from test command, Paolo Bonzini, 2020/09/02
- [PATCH 07/39] configure: do not include absolute paths in -I and -L paths,
Paolo Bonzini <=
- [PATCH 14/39] meson: convert qht-bench, Paolo Bonzini, 2020/09/02
- [PATCH 06/39] meson: remove b_lundef option, Paolo Bonzini, 2020/09/02
- [PATCH 11/39] meson: build qapi tests library, Paolo Bonzini, 2020/09/02
- [PATCH 08/39] configure: include cross sdl2-config in meson cross file, Paolo Bonzini, 2020/09/02
- [PATCH 05/39] mtest2make: unify tests that appear in multiple suites, Paolo Bonzini, 2020/09/02
- [PATCH 15/39] tests: qga has virtio-serial by default when host has it, Paolo Bonzini, 2020/09/02
- [PATCH 12/39] meson: declare tasn1 dependency, Paolo Bonzini, 2020/09/02
- [PATCH 10/39] meson: fix libqos linking, Paolo Bonzini, 2020/09/02
- [PATCH 21/39] tests: do not print benchmark output to stdout, Paolo Bonzini, 2020/09/02
- [PATCH 23/39] tests/migration/stress: remove unused exit_success, Paolo Bonzini, 2020/09/02