Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restore Windows compatibility in Makefile #76

Merged
merged 3 commits into from
Dec 12, 2022
Merged

Restore Windows compatibility in Makefile #76

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21f6919
restore Windows compatibility in Makefile
crunchyjoea Nov 17, 2022
679c567
make USE_PGXS case the default, make specific case for Windows builds
crunchyjoea Nov 21, 2022
29cbcc6
add NO_PGXS option flag to Makefile
crunchyjoea Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,16 @@ REGRESS = set_user

LDFLAGS_SL += $(filter -lm, $(LIBS))

ifdef WINDOWS_DISUSE_PGXS
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the non-pgxs build method still seems to be a thing some people are using, and that's all this is really providing an option for, I think it's probably good to just have this be the mode option for now. If things need to be more specialized for Windows, we can make those additions if/when that happens.

Suggested change
ifdef WINDOWS_DISUSE_PGXS
ifdef NO_PGXS

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds great to me!

subdir = contrib/set_user
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
else
PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
endif

.PHONY: install-headers uninstall-headers

Expand Down