database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-05 09:19:17 +03:00
Code

Fix fat-fingered makefile changes for pltcl.

Browse Source 
I put the OBJS assignments in the wrong order.  Per buildfarm.
This commit is contained in:
Tom Lane 2014-02-14 17:10:53 -05:00
parent 2128c52f5c
commit 638b153f2a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pl/tcl/Makefile
View File

@ -29,15 +29,28 @@ endif
endif endif
# On Windows, we don't link directly with the Tcl library; see below
ifneq ($(PORTNAME), win32) ifneq ($(PORTNAME), win32)
SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc
endif
else # win32
NAME = pltcl
OBJS = pltcl.o
DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \
pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl
REGRESS = pltcl_setup pltcl_queries
# where to find psql for running the tests
PSQLDIR = $(bindir)
# Tcl on win32 ships with import libraries only for Microsoft Visual C++, # Tcl on win32 ships with import libraries only for Microsoft Visual C++,
# which are not compatible with mingw gcc. Therefore we need to build a # which are not compatible with mingw gcc. Therefore we need to build a
# new import library to link with. # new import library to link with.
ifeq ($(PORTNAME), win32)
tclwithver = $(subst -l,,$(filter -l%, $(TCL_LIB_SPEC))) tclwithver = $(subst -l,,$(filter -l%, $(TCL_LIB_SPEC)))
TCLDLL = $(subst -L,,$(filter -L%, $(TCL_LIB_SPEC)))/$(tclwithver).dll TCLDLL = $(subst -L,,$(filter -L%, $(TCL_LIB_SPEC)))/$(tclwithver).dll
@ -53,18 +66,6 @@ $(tclwithver).def: $(TCLDLL)
endif # win32 endif # win32
NAME = pltcl
OBJS = pltcl.o
DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \
pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl
REGRESS = pltcl_setup pltcl_queries
# where to find psql for running the tests
PSQLDIR = $(bindir)
include $(top_srcdir)/src/Makefile.shlib include $(top_srcdir)/src/Makefile.shlib
ifeq ($(TCL_SHARED_BUILD), 1) ifeq ($(TCL_SHARED_BUILD), 1)