Fix make build on MinGW
Revert a couple of the simplifications done in commit 721856ff24
because platforms without ln -s, where LN_S='cp -pR', such as MinGW,
required the specific previous incantations.
Reported-by: Noah Misch <noah@leadboat.com>
Discussion: https://www.postgresql.org/message-id/20240616193448.28@rfd.leadboat.com
This commit is contained in:
parent
02bbc3c83a
commit
58445651db
|
@ -133,18 +133,24 @@ submake-utils-headers:
|
||||||
# Make symlinks for these headers in the include directory. That way
|
# Make symlinks for these headers in the include directory. That way
|
||||||
# we can cut down on the -I options. Also, a symlink is automatically
|
# we can cut down on the -I options. Also, a symlink is automatically
|
||||||
# up to date when we update the base file.
|
# up to date when we update the base file.
|
||||||
|
#
|
||||||
|
# The point of the prereqdir incantation in some of the rules below is to
|
||||||
|
# force the symlink to use an absolute path rather than a relative path.
|
||||||
|
# This is needed to support platforms without ln -s.
|
||||||
|
|
||||||
.PHONY: generated-headers
|
.PHONY: generated-headers
|
||||||
|
|
||||||
generated-headers: $(top_builddir)/src/include/storage/lwlocknames.h $(top_builddir)/src/include/utils/wait_event_types.h submake-catalog-headers submake-nodes-headers submake-utils-headers parser/gram.h
|
generated-headers: $(top_builddir)/src/include/storage/lwlocknames.h $(top_builddir)/src/include/utils/wait_event_types.h submake-catalog-headers submake-nodes-headers submake-utils-headers parser/gram.h
|
||||||
|
|
||||||
$(top_builddir)/src/include/storage/lwlocknames.h: storage/lmgr/lwlocknames.h
|
$(top_builddir)/src/include/storage/lwlocknames.h: storage/lmgr/lwlocknames.h
|
||||||
rm -f '$@'
|
prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
|
||||||
$(LN_S) ../../backend/$< '$@'
|
cd '$(dir $@)' && rm -f $(notdir $@) && \
|
||||||
|
$(LN_S) "$$prereqdir/$(notdir $<)" .
|
||||||
|
|
||||||
$(top_builddir)/src/include/utils/wait_event_types.h: utils/activity/wait_event_types.h
|
$(top_builddir)/src/include/utils/wait_event_types.h: utils/activity/wait_event_types.h
|
||||||
rm -f '$@'
|
prereqdir=`cd '$(dir $<)' >/dev/null && pwd` && \
|
||||||
$(LN_S) ../../backend/$< '$@'
|
cd '$(dir $@)' && rm -f $(notdir $@) && \
|
||||||
|
$(LN_S) "$$prereqdir/$(notdir $<)" .
|
||||||
|
|
||||||
utils/probes.o: utils/probes.d $(SUBDIROBJS)
|
utils/probes.o: utils/probes.d $(SUBDIROBJS)
|
||||||
$(DTRACE) $(DTRACEFLAGS) -C -G -s $(call expand_subsys,$^) -o $@
|
$(DTRACE) $(DTRACEFLAGS) -C -G -s $(call expand_subsys,$^) -o $@
|
||||||
|
|
Loading…
Reference in a new issue