From 6ad67908eb490465aaeaf411dbbdeec6eadd3a5e Mon Sep 17 00:00:00 2001
From: Tim Shimmin <tes@sgi.com>
Date: Tue, 4 Jul 2006 03:50:40 +0000
Subject: [PATCH] Fix up the irix build with the log format 32/64 packed
 changes being put into irix.h and GCCFLAGS separated out. Merge of
 master-melb:xfs-cmds:26404a by kenmcd.

  fix up compiler flags for irix - don't want gcc ones
---
 include/builddefs.in | 10 ++++++----
 src/global.h         |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/builddefs.in b/include/builddefs.in
index a98efdf2..d3459a35 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -52,17 +52,19 @@ HAVE_DB = @have_db@
 HAVE_AIO = @have_aio@
 HAVE_ATTR_LIST = @have_attr_list@
 
+GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
+
 ifeq ($(PKG_PLATFORM),linux)
-PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
 endif
 ifeq ($(PKG_PLATFORM),darwin)
-PCFLAGS = -traditional-cpp
+PCFLAGS = -traditional-cpp $(GCCFLAGS)
 endif
 ifeq ($(PKG_PLATFORM),irix)
-PCFLAGS = -nostdinc -I$(ROOT)/usr/include
+PCFLAGS = -nostdinc -I$(ROOT)/usr/include -I$(TOPDIR)/../irix/include
 endif
 
-GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
+GCFLAGS = $(OPTIMIZER) $(DEBUG) \
 	-I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\"
 
 # Global, Platform, Local CFLAGS
diff --git a/src/global.h b/src/global.h
index d1b760bd..158c1fac 100644
--- a/src/global.h
+++ b/src/global.h
@@ -22,6 +22,7 @@
 #include <config.h>
 
 #ifdef sgi
+#include <../../irix/include/xfs/platform_defs.h>
 #include <../../xfsprogs/include/irix.h>
 #endif
 
-- 
2.30.2