aboutsummaryrefslogtreecommitdiff
path: root/tests/fp
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2020-01-07 17:55:52 +0000
committerAlex Bennée <alex.bennee@linaro.org>2020-01-09 11:41:29 +0000
commit3618e3a6403079383904a1a61d53d0a57508b746 (patch)
tree18958682a133aad7ccf1b5150811ef2715fb6914 /tests/fp
parent289c8e592127eedb192d0f508f62f9f6531c0449 (diff)
downloadqemu-3618e3a6403079383904a1a61d53d0a57508b746.zip
qemu-3618e3a6403079383904a1a61d53d0a57508b746.tar.gz
qemu-3618e3a6403079383904a1a61d53d0a57508b746.tar.bz2
testing: don't nest build for fp-test
Re-calling the main make is counter-productive and really messes up with parallel builds. Just ensure we have built the pre-requisites before we build the fp-test bits. If the user builds manually just complain if the parent build hasn't got the bits we need. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Emilio G. Cota <cota@braap.org>
Diffstat (limited to 'tests/fp')
-rw-r--r--tests/fp/Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/fp/Makefile b/tests/fp/Makefile
index 5a35e7c2..56768ec 100644
--- a/tests/fp/Makefile
+++ b/tests/fp/Makefile
@@ -554,15 +554,13 @@ TF_OBJS_LIB += $(TF_OBJS_TEST)
BINARIES := fp-test$(EXESUF) fp-bench$(EXESUF)
-# everything depends on config-host.h because platform.h includes it
-all: $(BUILD_DIR)/config-host.h
- $(MAKE) $(BINARIES)
+# We require artefacts from the main build including config-host.h
+# because platform.h includes it. Rather than re-invoking the main
+# build we just error out if things aren't there.
+$(LIBQEMUUTIL) $(BUILD_DIR)/config-host.h:
+ $(error $@ missing, re-run parent build)
-$(LIBQEMUUTIL):
- $(MAKE) -C $(BUILD_DIR) libqemuutil.a
-
-$(BUILD_DIR)/config-host.h:
- $(MAKE) -C $(BUILD_DIR) config-host.h
+all: $(BUILD_DIR)/config-host.h $(BINARIES)
# libtestfloat.a depends on libsoftfloat.a, so specify it first
FP_TEST_LIBS := libtestfloat.a libsoftfloat.a $(LIBQEMUUTIL)