diff options
| author | Tom Lane | 2014-02-11 17:56:20 +0000 |
|---|---|---|
| committer | Tom Lane | 2014-02-11 17:56:20 +0000 |
| commit | 846e91e0223cf9f2821c3ad4dfffffbb929cb027 (patch) | |
| tree | a169dca9e7cd640f1204ea8282ed44926bf72e88 /src/backend/Makefile | |
| parent | cba6ffaef3987211fb31ba869eb2a476bad6f6d3 (diff) | |
Get rid of use of dlltool in Mingw builds.
We are almost completely out of the dlltool game, if this works.
Hiroshi Inoue
Diffstat (limited to 'src/backend/Makefile')
| -rw-r--r-- | src/backend/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index 8afb1893fd1..870a02292fc 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -78,18 +78,10 @@ endif # cygwin ifeq ($(PORTNAME), win32) LIBS += -lsecur32 -postgres: $(OBJS) postgres.def libpostgres.a $(WIN32RES) - $(DLLTOOL) --dllname $@$(X) --output-exp $@.exp --def postgres.def - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) -o $@$(X) -Wl,--base-file,$@.base $@.exp $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LIBS) - $(DLLTOOL) --dllname $@$(X) --base-file $@.base --output-exp $@.exp --def postgres.def - $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -o $@$(X) $@.exp $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LIBS) - rm -f $@.exp $@.base +postgres: $(OBJS) $(WIN32RES) + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LIBS) -o $@$(X) -postgres.def: $(OBJS) - $(DLLTOOL) --export-all --output-def $@ $(call expand_subsys,$^) - -libpostgres.a: postgres.def - $(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@ +libpostgres.a: postgres ; endif # win32 @@ -296,7 +288,7 @@ ifeq ($(PORTNAME), cygwin) rm -f postgres.dll libpostgres.a endif ifeq ($(PORTNAME), win32) - rm -f postgres.dll postgres.def libpostgres.a $(WIN32RES) + rm -f postgres.dll libpostgres.a $(WIN32RES) endif distclean: clean |