aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2006-04-28 17:09:16 +0000
committerBruce Momjian <bruce@momjian.us>2006-04-28 17:09:16 +0000
commit4c5eb2c2cb1b1397255fb82685b7ba17f49ca47c (patch)
tree27bd997e37537084d16da4518d25ccd0ce8fb149 /src
parent83b692d9bb50a0003b192b82ac82b39904ba2d66 (diff)
downloadpostgresql-4c5eb2c2cb1b1397255fb82685b7ba17f49ca47c.tar.gz
postgresql-4c5eb2c2cb1b1397255fb82685b7ba17f49ca47c.zip
Modify Solaris compiler build rules to use the cpp preprocessor, the the
x86 file.
Diffstat (limited to 'src')
-rw-r--r--src/backend/port/Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile
index 62b63413584..be5db0a664b 100644
--- a/src/backend/port/Makefile
+++ b/src/backend/port/Makefile
@@ -13,7 +13,7 @@
# be converted to Method 2.
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.22 2006/01/05 03:01:35 momjian Exp $
+# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.23 2006/04/28 17:09:16 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -48,14 +48,20 @@ win32.dir:
$(MAKE) -C win32 all
tas.o: tas.s
+ifeq ($(PORTNAME), solaris)
+ # preprocess assembler file with cpp, used by x86
+ $(CC) $(CFLAGS) -c -P $<
+ mv $*.i $*_cpp.s
+ $(CC) $(CFLAGS) -c $*_cpp.s -o $@
+else
$(CC) $(CFLAGS) -c $<
+endif
# IPC test program
ipc_test: ipc_test.o pg_sema.o pg_shmem.o
$(CC) $(CFLAGS) $(LDFLAGS) $(export_dynamic) $^ $(LIBS) -o $@
distclean clean:
- rm -f SUBSYS.o $(OBJS) ipc_test ipc_test.o
+ rm -f SUBSYS.o $(OBJS) ipc_test ipc_test.o tas_cpp.s
$(MAKE) -C darwin clean
$(MAKE) -C win32 clean
-