You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by yj...@apache.org on 2026/03/09 22:52:40 UTC
(cloudberry) branch cbdb-postgres-merge updated: Fix merge conflict artifact in src/backend/Makefile
This is an automated email from the ASF dual-hosted git repository.
yjhjstz pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this push:
new 5514fc10f88 Fix merge conflict artifact in src/backend/Makefile
5514fc10f88 is described below
commit 5514fc10f88a318952d805dc371809baeec79e7d
Author: Jianghua Yang <yj...@gmail.com>
AuthorDate: Mon Mar 9 15:52:22 2026 -0700
Fix merge conflict artifact in src/backend/Makefile
Remove stray '=' on the postgres target prerequisite line that was
left behind during the PG16 merge, causing "recipe commences before
first target" build failures.
---
src/backend/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/backend/Makefile b/src/backend/Makefile
index fb9d5e5aceb..abeb733704f 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -93,7 +93,7 @@ postgres: main/main.o libpostgres.so $(top_builddir)/src/port/libpgport_srv.a $(
$(top_builddir)/src/common/libpgcommon_srv.a $(LIBS) -o $@
else
-postgres: $(OBJS)=
+postgres: $(OBJS)
$(CXX) $(CXXFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) -o $@
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org