From 26d03d34f794b0ce836c63cd8a225a118dae6bf2 Mon Sep 17 00:00:00 2001 From: Sam Gross Date: Fri, 21 Mar 2025 17:28:08 +0000 Subject: [PATCH] gh-131556: Fix build-details.json Makefile target Use the contents of `pybuilddir.txt` as a prefix for the build-details.json path, if it exists. --- Makefile.pre.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index db84eb61a780a7..d57bf6d714eb23 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -730,7 +730,8 @@ list-targets: .PHONY: build_all build_all: check-clean-src check-app-store-compliance $(BUILDPYTHON) platform sharedmods \ - gdbhooks Programs/_testembed scripts checksharedmods rundsymutil build-details.json + gdbhooks Programs/_testembed scripts checksharedmods rundsymutil \ + $(shell [ -f pybuilddir.txt ] && cat pybuilddir.txt)/build-details.json .PHONY: build_wasm build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \ @@ -936,8 +937,8 @@ pybuilddir.txt: $(PYTHON_FOR_BUILD_DEPS) exit 1 ; \ fi -build-details.json: pybuilddir.txt - $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/generate-build-details.py `cat pybuilddir.txt`/build-details.json +$(shell [ -f pybuilddir.txt ] && cat pybuilddir.txt)/build-details.json: pybuilddir.txt + $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/generate-build-details.py $(shell cat pybuilddir.txt)/build-details.json # Build static library $(LIBRARY): $(LIBRARY_OBJS)