Make xfstests build use -O2 by default.
authorNathan Scott <nathans@sgi.com>
Wed, 5 Apr 2006 03:55:41 +0000 (03:55 +0000)
committerNathan Scott <nathans@sgi.com>
Wed, 5 Apr 2006 03:55:41 +0000 (03:55 +0000)
Merge of master-melb:xfs-cmds:25677a by kenmcd.

aclocal.m4
include/builddefs.in
m4/package_globals.m4

index 5cc06cb..6e51d46 100644 (file)
@@ -173,7 +173,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     debug_build="$DEBUG"
     AC_SUBST(debug_build)
 
-    OPTIMIZER=${OPTIMIZER:-'-g'}       dnl  -O2
+    OPTIMIZER=${OPTIMIZER:-'-g -O2'}
     opt_build="$OPTIMIZER"
     AC_SUBST(opt_build)
 
index 3d7c625..353ab23 100644 (file)
@@ -57,15 +57,13 @@ endif
 ifeq ($(PKG_PLATFORM),darwin)
 PCFLAGS = -traditional-cpp
 endif
-
 ifeq ($(PKG_PLATFORM),irix)
-CFLAGS += $(OPTIMIZER) $(DEBUG) -nostdinc -I$(ROOT)/usr/include \
-       -I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\" -D_REENTRANT
-else
-CFLAGS += -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
-       -I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\" -D_REENTRANT
+PCFLAGS = -nostdinc -I$(ROOT)/usr/include
 endif
 
+GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
+       -I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\"
+
 # Global, Platform, Local CFLAGS
 CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS)
 
index c28e1a1..665afc8 100644 (file)
@@ -19,7 +19,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     debug_build="$DEBUG"
     AC_SUBST(debug_build)
 
-    OPTIMIZER=${OPTIMIZER:-'-g'}       dnl  -O2
+    OPTIMIZER=${OPTIMIZER:-'-g -O2'}
     opt_build="$OPTIMIZER"
     AC_SUBST(opt_build)