aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorYonggang Luo <luoyonggang@gmail.com>2020-09-03 01:00:49 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2020-09-08 11:43:16 +0200
commit5d91a2ed799cc0fe4e96c8c8786353c00a64c8ed (patch)
treebf50c5f7fa4a20a000bddd2a420f8dbfc4869358 /configure
parent738aa606248ba4c04ca666f42db234c750728050 (diff)
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 7 insertions, 4 deletions
diff --git a/configure b/configure
index 4b2ceb094d..ba8c6e6c5d 100755
--- a/configure
+++ b/configure
@@ -2003,9 +2003,6 @@ fi
if test "$meson" = git; then
git_submodules="${git_submodules} meson"
fi
-if test "$git_update" = yes; then
- (cd "${source_path}" && GIT="$git" "./scripts/git-submodule.sh" update "$git_submodules")
-fi
case "$meson" in
git | internal)
@@ -4184,7 +4181,6 @@ EOF
if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then
fdt=git
mkdir -p dtc
- symlink "$source_path/dtc/Makefile" "dtc/Makefile"
fdt_cflags="-I${source_path}/dtc/libfdt"
fdt_ldflags="-Ldtc/libfdt"
fdt_libs="$fdt_libs"
@@ -6502,6 +6498,13 @@ else
cxx=
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"
echo "# Automatically generated by configure - do not modify" > $config_host_mak