mirror of
				https://github.com/postgres/postgres.git
				synced 2025-10-29 22:49:41 +03:00 
			
		
		
		
	Split the LDFLAGS make variable into two parts: LDFLAGS is now used for
linking both executables and shared libraries, and we add on LDFLAGS_EX when linking executables or LDFLAGS_SL when linking shared libraries. This provides a significantly cleaner way of dealing with link-time switches than the former behavior. Also, make sure that the various platform-specific %.so: %.o rules incorporate LDFLAGS and LDFLAGS_SL; most of them missed that before. (I did not add these variables for the platforms that invoke $(LD) directly, however. It's not clear if we can do that safely, since for the most part we assume these variables use CC command-line syntax.) Per gripe from Aaron Swenson and subsequent investigation.
This commit is contained in:
		| @@ -5,7 +5,7 @@ | ||||
| # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group | ||||
| # Portions Copyright (c) 1994, Regents of the University of California | ||||
| # | ||||
| # $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.45 2010/05/12 11:33:10 momjian Exp $ | ||||
| # $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.46 2010/07/05 18:54:38 tgl Exp $ | ||||
| # | ||||
| #------------------------------------------------------------------------- | ||||
|  | ||||
| @@ -23,7 +23,7 @@ override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psq | ||||
| all: submake-libpq $(PROGRAMS) | ||||
|  | ||||
| %: %.o $(WIN32RES) | ||||
| 	$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X) | ||||
| 	$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) | ||||
|  | ||||
| createdb: createdb.o common.o dumputils.o kwlookup.o keywords.o | ||||
| createlang: createlang.o common.o print.o mbprint.o | ||||
|   | ||||
		Reference in New Issue
	
	Block a user