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

diff --git a/include/builddefs.in b/include/builddefs.in
index a98efdf20588b69c28daac8ba9868a16618f7e02..d3459a35cec80d2cb389cd4308fdee6ddbcfed66 100644 (file)
--- 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 d1b760bd3bdcd4a0af63ae585174a93899d8d4f9..158c1faca7950d2c3a41e79afb0cd64bc70821c0 100644 (file)
--- 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