Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 638b153

Browse files
committed
Fix fat-fingered makefile changes for pltcl.
I put the OBJS assignments in the wrong order. Per buildfarm.
1 parent 2128c52 commit 638b153

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

src/pl/tcl/Makefile

+15-14
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,28 @@ endif
2929
endif
3030

3131

32+
# On Windows, we don't link directly with the Tcl library; see below
3233
ifneq ($(PORTNAME), win32)
33-
3434
SHLIB_LINK = $(TCL_LIB_SPEC) $(TCL_LIBS) -lc
35+
endif
36+
37+
38+
NAME = pltcl
39+
40+
OBJS = pltcl.o
3541

36-
else # win32
42+
DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \
43+
pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
44+
45+
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl
46+
REGRESS = pltcl_setup pltcl_queries
47+
# where to find psql for running the tests
48+
PSQLDIR = $(bindir)
3749

3850
# Tcl on win32 ships with import libraries only for Microsoft Visual C++,
3951
# which are not compatible with mingw gcc. Therefore we need to build a
4052
# new import library to link with.
53+
ifeq ($(PORTNAME), win32)
4154

4255
tclwithver = $(subst -l,,$(filter -l%, $(TCL_LIB_SPEC)))
4356
TCLDLL = $(subst -L,,$(filter -L%, $(TCL_LIB_SPEC)))/$(tclwithver).dll
@@ -53,18 +66,6 @@ $(tclwithver).def: $(TCLDLL)
5366
endif # win32
5467

5568

56-
NAME = pltcl
57-
58-
OBJS = pltcl.o
59-
60-
DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \
61-
pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
62-
63-
REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl
64-
REGRESS = pltcl_setup pltcl_queries
65-
# where to find psql for running the tests
66-
PSQLDIR = $(bindir)
67-
6869
include $(top_srcdir)/src/Makefile.shlib
6970

7071
ifeq ($(TCL_SHARED_BUILD), 1)

0 commit comments

Comments
 (0)