mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 18:44:58 -06:00
configure: update dtc submodule
Update the dtc submodule in configure already and symlink dtc after git submodule update, because on win32 symlinks to non-existing folders are forbidden. Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Message-Id: <20200902170054.810-2-luoyonggang@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
738aa60624
commit
5d91a2ed79
1 changed files with 7 additions and 4 deletions
11
configure
vendored
11
configure
vendored
|
@ -2003,9 +2003,6 @@ fi
|
||||||
if test "$meson" = git; then
|
if test "$meson" = git; then
|
||||||
git_submodules="${git_submodules} meson"
|
git_submodules="${git_submodules} meson"
|
||||||
fi
|
fi
|
||||||
if test "$git_update" = yes; then
|
|
||||||
(cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update "$git_submodules")
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$meson" in
|
case "$meson" in
|
||||||
git | internal)
|
git | internal)
|
||||||
|
@ -4184,7 +4181,6 @@ EOF
|
||||||
if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
|
if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
|
||||||
fdt=git
|
fdt=git
|
||||||
mkdir -p dtc
|
mkdir -p dtc
|
||||||
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
|
|
||||||
fdt_cflags="-I${source_path}/dtc/libfdt"
|
fdt_cflags="-I${source_path}/dtc/libfdt"
|
||||||
fdt_ldflags="-Ldtc/libfdt"
|
fdt_ldflags="-Ldtc/libfdt"
|
||||||
fdt_libs="$fdt_libs"
|
fdt_libs="$fdt_libs"
|
||||||
|
@ -6502,6 +6498,13 @@ else
|
||||||
cxx=
|
cxx=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test $git_update = 'yes' ; then
|
||||||
|
(cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update "$git_submodules")
|
||||||
|
fi
|
||||||
|
if test "$fdt" = "git" ; then
|
||||||
|
symlink "$source_path/dtc/Makefile" "dtc/Makefile"
|
||||||
|
fi
|
||||||
|
|
||||||
config_host_mak="config-host.mak"
|
config_host_mak="config-host.mak"
|
||||||
|
|
||||||
echo "# Automatically generated by configure - do not modify" > $config_host_mak
|
echo "# Automatically generated by configure - do not modify" > $config_host_mak
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue