Skip to content

Commit 26d03d3

Browse files
committed
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.
1 parent 4f32516 commit 26d03d3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile.pre.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,8 @@ list-targets:
730730

731731
.PHONY: build_all
732732
build_all: check-clean-src check-app-store-compliance $(BUILDPYTHON) platform sharedmods \
733-
gdbhooks Programs/_testembed scripts checksharedmods rundsymutil build-details.json
733+
gdbhooks Programs/_testembed scripts checksharedmods rundsymutil \
734+
$(shell [ -f pybuilddir.txt ] && cat pybuilddir.txt)/build-details.json
734735

735736
.PHONY: build_wasm
736737
build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \
@@ -936,8 +937,8 @@ pybuilddir.txt: $(PYTHON_FOR_BUILD_DEPS)
936937
exit 1 ; \
937938
fi
938939

939-
build-details.json: pybuilddir.txt
940-
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/generate-build-details.py `cat pybuilddir.txt`/build-details.json
940+
$(shell [ -f pybuilddir.txt ] && cat pybuilddir.txt)/build-details.json: pybuilddir.txt
941+
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/generate-build-details.py $(shell cat pybuilddir.txt)/build-details.json
941942

942943
# Build static library
943944
$(LIBRARY): $(LIBRARY_OBJS)

0 commit comments

Comments
 (0)