Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitefc34e2

Browse files
committed
Add $(X) for cross-compiling. Seems the mingw compiler running on
FreeBSD doesn't add .EXE to links.Michiel Ephraim
1 parent725524b commitefc34e2

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

‎src/bin/initdb/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.35 2003/12/23 21:56:20 tgl Exp $
8+
# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.36 2004/04/26 17:40:48 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -20,7 +20,7 @@ OBJS=initdb.o
2020
all: submake-libpq submake-libpgport initdb
2121

2222
initdb:$(OBJS)$(libpq_builddir)/libpq.a
23-
$(CC)$(CFLAGS)$(OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@
23+
$(CC)$(CFLAGS)$(OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@$(X)
2424

2525
install: all installdirs
2626
$(INSTALL_PROGRAM) initdb$(X)$(DESTDIR)$(bindir)/initdb$(X)

‎src/bin/pg_controldata/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.5 2004/02/10 23:24:13 tgl Exp $
7+
# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.6 2004/04/26 17:40:48 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -17,7 +17,7 @@ OBJS= pg_controldata.o pg_crc.o
1717
all: submake-libpgport pg_controldata
1818

1919
pg_controldata:$(OBJS)
20-
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LIBS) -o$@
20+
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LIBS) -o$@$(X)
2121

2222
pg_crc.c:$(top_srcdir)/src/backend/utils/hash/pg_crc.c
2323
rm -f$@&&$(LN_S)$<.

‎src/bin/pg_dump/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.44 2004/02/07 07:20:12 tgl Exp $
8+
# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.45 2004/04/26 17:40:48 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -25,13 +25,13 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DBINDIR=\"$(bindir)\"
2525
all: submake-libpq submake-libpgport submake-backend pg_dump pg_restore pg_dumpall
2626

2727
pg_dump: pg_dump.o common.o pg_dump_sort.o$(OBJS)$(libpq_builddir)/libpq.a
28-
$(CC)$(CFLAGS) pg_dump.o common.o pg_dump_sort.o$(OBJS)$(EXTRA_OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@
28+
$(CC)$(CFLAGS) pg_dump.o common.o pg_dump_sort.o$(OBJS)$(EXTRA_OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@$(X)
2929

3030
pg_restore: pg_restore.o$(OBJS)$(libpq_builddir)/libpq.a
31-
$(CC)$(CFLAGS) pg_restore.o$(OBJS)$(EXTRA_OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@
31+
$(CC)$(CFLAGS) pg_restore.o$(OBJS)$(EXTRA_OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@$(X)
3232

3333
pg_dumpall: pg_dumpall.o dumputils.o$(libpq_builddir)/libpq.a
34-
$(CC)$(CFLAGS) pg_dumpall.o dumputils.o$(EXTRA_OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@
34+
$(CC)$(CFLAGS) pg_dumpall.o dumputils.o$(EXTRA_OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@$(X)
3535

3636
.PHONY: submake-backend
3737
submake-backend:

‎src/bin/pg_resetxlog/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1998-2002, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.6 2004/03/05 01:11:04 momjian Exp $
7+
# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.7 2004/04/26 17:40:48 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -20,7 +20,7 @@ OBJS= pg_resetxlog.o pg_crc.o \
2020
all: submake-libpgport pg_resetxlog
2121

2222
pg_resetxlog:$(OBJS)
23-
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LIBS) -o$@
23+
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LIBS) -o$@$(X)
2424

2525
dirmod.c:% :$(top_srcdir)/src/port/%
2626
rm -f$@&&$(LN_S)$<.

‎src/bin/psql/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.42 2004/04/22 14:33:45 momjian Exp $
8+
# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.43 2004/04/26 17:40:48 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -27,7 +27,7 @@ FLEXFLAGS = -Cfe
2727
all: submake-libpq submake-libpgport psql
2828

2929
psql:$(OBJS)$(libpq_builddir)/libpq.a
30-
$(CC)$(CFLAGS)$(OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@
30+
$(CC)$(CFLAGS)$(OBJS)$(libpq)$(LDFLAGS)$(LIBS) -o$@$(X)
3131

3232
help.o:$(srcdir)/sql_help.h
3333

‎src/bin/scripts/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
8-
# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.25 2003/11/29 19:52:07 pgsql Exp $
8+
# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.26 2004/04/26 17:40:48 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -20,7 +20,7 @@ override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psq
2020
all: submake-libpq submake-backend$(PROGRAMS)
2121

2222
%:%.o
23-
$(CC)$(CFLAGS)$^$(libpq)$(LDFLAGS)$(LIBS) -o$@
23+
$(CC)$(CFLAGS)$^$(libpq)$(LDFLAGS)$(LIBS) -o$@$(X)
2424

2525
createdb: createdb.o common.o dumputils.o$(top_builddir)/src/backend/parser/keywords.o
2626
createlang: createlang.o common.o print.o mbprint.o

‎src/interfaces/ecpg/preproc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.101 2004/04/25 20:57:32 momjian Exp $
1+
# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.102 2004/04/26 17:40:48 momjian Exp $
22

33
subdir = src/interfaces/ecpg/preproc
44
top_builddir = ../../../..
@@ -26,7 +26,7 @@ OBJS=preproc.o type.o ecpg.o ecpg_keywords.o output.o\
2626
all: submake-libpgport ecpg
2727

2828
ecpg:$(OBJS)
29-
$(CC)$(CFLAGS)$(LDFLAGS)$^$(LIBS)$(PTHREAD_LIBS) -o$@
29+
$(CC)$(CFLAGS)$(LDFLAGS)$^$(LIBS)$(PTHREAD_LIBS) -o$@$(X)
3030

3131
# pgc is compiled as part of preproc
3232
preproc.o:$(srcdir)/pgc.c

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp