aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2021-05-19 13:38:40 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2021-05-26 14:50:05 +0200
commit54b0306e6967ae38e248b905ddaa4a3cdbc15322 (patch)
tree68baea180f912388942fcce08ac17f23e8dc6262
parent16b3f3bbab7db8f87bdb5ddb226bf19c4c55abdd (diff)
configure: Avoid error messages about missing *-config-*.h files
When compiling with --disable-system there is a harmless yet still annoying error message at the end of the "configure" step: sed: can't read *-config-devices.h: No such file or directory When only building the tools or docs, without any emulator at all, there is even an additional message about missing *-config-target.h files. Fix it by checking whether any of these files are available before using them. Fixes: e0447a834d ("configure: Poison all current target-specific #defines") Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20210519113840.298174-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rwxr-xr-xconfigure12
1 files changed, 8 insertions, 4 deletions
diff --git a/configure b/configure
index cca532bb0c..90c0807347 100755
--- a/configure
+++ b/configure
@@ -6503,10 +6503,14 @@ fi
# Create list of config switches that should be poisoned in common code...
# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special.
-sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
- -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
- *-config-devices.h *-config-target.h | \
- sort -u > config-poison.h
+target_configs_h=$(ls *-config-devices.h *-config-target.h 2>/dev/null)
+if test -n "$target_configs_h" ; then
+ sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
+ -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
+ $target_configs_h | sort -u > config-poison.h
+else
+ :> config-poison.h
+fi
# Save the configure command line for later reuse.
cat <<EOD >config.status