From 10da36ff0d903afbceef633ae5ce46b6c12ca006 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Thu, 10 Mar 2011 00:20:26 +0000
Subject: [PATCH] Remove redundant entries from MT_CFLAGS

Don't include XCFLAGS in MT_CFLAGS, as this is now done elsewhere in
the build process. Don't multiply specify -DAFS_PTHREAD_ENV, as all
pthreaded build rules must defined this, and just doing so in one
place is much cleaner.

Change-Id: I2cc1f88119e9ad32151cb7575222c2d2c008005f
Reviewed-on: http://gerrit.openafs.org/4190
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/cf/osconf.m4 | 111 ++++++++++++++++++++++-------------------------
 1 file changed, 53 insertions(+), 58 deletions(-)

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index c2cd974bff..660a7d1206 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -2,7 +2,6 @@
 AC_DEFUN([OPENAFS_OSCONF], [
 
 dnl defaults, override in case below as needed
-XCFLAGS='${DBG} ${OPTMZ}'
 RXDEBUG="-DRXDEBUG"
 SHLIB_SUFFIX="so"
 CCOBJ="$CC"
@@ -43,7 +42,7 @@ case $AFS_SYSNAME in
 		MT_CC="cc"
 		CSTATIC="-non_shared"
 		DBG="-g3"
-		MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_REENTRANT=1 -pthread'
 		MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
 		XCFLAGS="-D_NO_PROTO -DOSF"
 		SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
@@ -56,7 +55,7 @@ case $AFS_SYSNAME in
 		LEX="flex -l"
 		DBG="-g3"
 		CSTATIC="-non_shared"
-		MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_REENTRANT=1 -pthread'
 		MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
 		XCFLAGS="-D_NO_PROTO -DOSF"
 		SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
@@ -69,7 +68,7 @@ case $AFS_SYSNAME in
 		DBG="-g3"
 		CSTATIC="-non_shared"
 		LWP_OPTMZ="-O2"
-		MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_REENTRANT=1 -pthread'
 		MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
 		XCFLAGS="-D_NO_PROTO -DOSF"
 		SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
@@ -77,7 +76,7 @@ case $AFS_SYSNAME in
 
 	alpha_linux_22)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -89,7 +88,7 @@ case $AFS_SYSNAME in
 	alpha_linux_24)
 		CCOBJ="${CC} -fPIC"
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -101,7 +100,7 @@ case $AFS_SYSNAME in
 	alpha_linux_26)
 		CCOBJ="${CC} -fPIC"
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -113,7 +112,7 @@ case $AFS_SYSNAME in
 	arm_linux24)
 		CCOBJ="${CC} -fPIC"
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -125,7 +124,7 @@ case $AFS_SYSNAME in
 	arm_linux26)
 		CCOBJ="${CC} -fPIC"
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -143,7 +142,7 @@ case $AFS_SYSNAME in
 		LEX="/opt/langtools/bin/lex"
 		LWP_OPTMZ="-O"
 		MT_CC="/opt/ansic/bin/cc -Ae"
-		MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_POSIX_C_SOURCE=199506L'
 		MT_LIBS='-L/opt/dce/lib -ldce ${XLIBS}'
 		MV="/bin/mv"
 		OPTMZ="-O"
@@ -171,7 +170,7 @@ case $AFS_SYSNAME in
 		LEX="/opt/langtools/bin/lex"
 		LWP_OPTMZ="-O"
 		MT_CC="$CC"
-		MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_POSIX_C_SOURCE=199506L'
 		MV="/bin/mv"
 		OPTMZ="-O"
 		PAM_CFLAGS="+DA1.0 +z -Wl,+k"
@@ -199,7 +198,7 @@ case $AFS_SYSNAME in
 		LEX="/opt/langtools/bin/lex"
 		LWP_OPTMZ=""
 		MT_CC="$CC"
-		MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_POSIX_C_SOURCE=199506L'
 		MV="/bin/mv"
 		OPTMZ="-O"
 		PAM_CFLAGS="-b +z -Wl,+k"
@@ -218,7 +217,7 @@ case $AFS_SYSNAME in
 		;;
 
 	i386_fbsd_*)
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-pipe -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
@@ -227,7 +226,7 @@ case $AFS_SYSNAME in
 		;;
 
 	i386_dfbsd_*)
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-pipe -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
@@ -236,7 +235,7 @@ case $AFS_SYSNAME in
 		;;
 
 	amd64_fbsd_*)
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_CFLAGS="-O2 -pipe -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
 		SHLIB_LINKER="${MT_CC} -shared"
@@ -244,7 +243,7 @@ case $AFS_SYSNAME in
 		;;
 
 	*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*)
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-pipe -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -254,7 +253,6 @@ case $AFS_SYSNAME in
 		;;
 
 	*nbsd15|*nbsd16)
-		MT_CFLAGS='${XCFLAGS}'
 		MT_LIBS='${XLIBS}'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-pipe -fPIC"
@@ -265,7 +263,7 @@ case $AFS_SYSNAME in
 
 	ia64_linux24|ia64_linux26)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -277,7 +275,7 @@ case $AFS_SYSNAME in
 	amd64_linux*)
 		CCOBJ="${CC} -fPIC"
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -288,7 +286,7 @@ case $AFS_SYSNAME in
 
 	ppc64_linux24)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
@@ -299,7 +297,7 @@ case $AFS_SYSNAME in
 
 	ppc64_linux26)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_LDFLAGS="-shared -Xlinker -x"
@@ -310,7 +308,7 @@ case $AFS_SYSNAME in
 
 	i386_umlinux22)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -321,7 +319,7 @@ case $AFS_SYSNAME in
 
 	i386_linux*)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		DBG=-g
 		KERN_DBG=-g
 		LWP_DBG=-g
@@ -336,7 +334,7 @@ case $AFS_SYSNAME in
 
 	i386_umlinux24)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		DBG=-g
 		KERN_DBG=-g
 		LWP_DBG=-g
@@ -352,7 +350,7 @@ case $AFS_SYSNAME in
 
 	i386_umlinux26)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		DBG=-g
 		KERN_DBG=-g
 		LWP_DBG=-g
@@ -368,7 +366,7 @@ case $AFS_SYSNAME in
 
 	*_obsd*)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		LWP_OPTMZ=-O2
 		OPTMZ=-O2
 		PAM_OPTMZ=-O2
@@ -381,7 +379,7 @@ case $AFS_SYSNAME in
 
 	parisc_linux24)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -395,7 +393,7 @@ case $AFS_SYSNAME in
 		CCOBJ="cc"
 		MT_CC="cc"
 		AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-D_REENTRANT'
 		KROOT=
 		KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
 		LWP_OPTMZ="-O2"
@@ -413,7 +411,7 @@ case $AFS_SYSNAME in
 		CCOBJ="cc"
 		MT_CC="cc"
 		AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-		MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} \${ARCHFLAGS}"
+		MT_CFLAGS="-D_REENTRANT"
 		KROOT=
 		KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
 		KERN_OPTMZ="-Os"
@@ -430,7 +428,7 @@ case $AFS_SYSNAME in
 
 	*_darwin_90)
 		AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-		MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} \${ARCHFLAGS}"
+		MT_CFLAGS="-D_REENTRANT"
 		KROOT=
 		KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
 		LD="cc"
@@ -448,7 +446,7 @@ case $AFS_SYSNAME in
 
 	arm_darwin_100)
 		AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+		MT_CFLAGS="-D_REENTRANT"
 		MT_LIBS="${LIB_AFSDB} -framework CoreFoundation"
 		KROOT=
 		KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
@@ -468,7 +466,7 @@ case $AFS_SYSNAME in
 
 	*_darwin_100)
 		AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-		MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT \${XCFLAGS} \${ARCHFLAGS}"
+		MT_CFLAGS="-D_REENTRANT"
 		MT_LIBS='${XLIBS}'
 		KROOT=
 		KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
@@ -488,7 +486,7 @@ case $AFS_SYSNAME in
 
 	ppc_linux*)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -503,7 +501,6 @@ case $AFS_SYSNAME in
 		DBG=""
 		LIBSYS_AIX_EXP="afsl.exp"
 		MT_CC="xlc_r"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
 		SHLIB_SUFFIX="o"
 		XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
 		XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
@@ -519,7 +516,6 @@ case $AFS_SYSNAME in
 		DBG=""
 		LIBSYS_AIX_EXP="afsl.exp"
 		MT_CC="xlc_r"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
 		SHLIB_SUFFIX="o"
 		XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
 		XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
@@ -534,7 +530,6 @@ case $AFS_SYSNAME in
 		DBG=""
 		LIBSYS_AIX_EXP="afsl.exp"
 		MT_CC="xlc_r"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
 		SHLIB_SUFFIX="o"
 		XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
 		XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
@@ -549,7 +544,6 @@ case $AFS_SYSNAME in
 		DBG="-g"
 		LIBSYS_AIX_EXP="afsl.exp"
 		MT_CC="xlc_r"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
 		SHLIB_SUFFIX="o"
 		XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
 		XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
@@ -564,7 +558,6 @@ case $AFS_SYSNAME in
 		DBG="-g"
 		LIBSYS_AIX_EXP="afsl.exp"
 		MT_CC="xlc_r"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
 		SHLIB_SUFFIX="o"
 		XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
 		XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
@@ -577,7 +570,7 @@ case $AFS_SYSNAME in
 		LD="ld"
 		KERN_OPTMZ=-O2
 		MT_CC="$CC"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -591,7 +584,7 @@ case $AFS_SYSNAME in
 		LD="ld"
 		KERN_OPTMZ=-O2
 		MT_CC="$CC"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -605,7 +598,7 @@ case $AFS_SYSNAME in
 		LD="ld"
 		KERN_OPTMZ=-O2
 		MT_CC="$CC"
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -621,7 +614,7 @@ case $AFS_SYSNAME in
 		MT_CC="cc"
 		AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
 		FSINCLUDES="-I/usr/include/sys/fs"
-		MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_SGI_MP_SOURCE'
 		XCFLAGS64="-64 -mips3"
 		XCFLAGS="-o32"
 		XLDFLAGS64="-64"
@@ -635,7 +628,7 @@ case $AFS_SYSNAME in
 		MT_CC="cc"
 		AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
 		FSINCLUDES="-I/usr/include/sys/fs"
-		MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_SGI_MP_SOURCE'
 		XCFLAGS64="-D_BSD_COMPAT -64 -mips3"
 		XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -o32"
 		XLDFLAGS64="-64"
@@ -649,7 +642,7 @@ case $AFS_SYSNAME in
 		MT_CC="cc"
 		AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a"
 		FSINCLUDES="-I/usr/include/sys/fs"
-		MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_SGI_MP_SOURCE'
 		XCFLAGS64="-D_BSD_COMPAT -64 -mips3"
 		XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -n32 -woff 1009,1014,1110,1116,1164,1169,1171,1174,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552,3201 -Wl,-woff,84,-woff,15"
 		XLDFLAGS64="-64"
@@ -664,7 +657,7 @@ case $AFS_SYSNAME in
 		FSINCLUDES="-I/usr/include/sys/fs"
 		LD="/usr/bin/ld"
 		MT_CC="/usr/bin/cc"
-		MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-D_SGI_MP_SOURCE'
 		XCFLAGS64="-64 -mips3"
 		XCFLAGS="-n32 -mips3 -woff 1009,1014,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552,3201 -Wl,-woff,84,-woff,15"
 		XLDFLAGS64="-64 -mips3"
@@ -674,7 +667,7 @@ case $AFS_SYSNAME in
 
 	sparc*_linux*)
 		KERN_OPTMZ=-O2
-		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+		MT_CFLAGS='-pthread -D_REENTRANT'
 		PAM_OPTMZ=-O2
 		PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
 		SHLIB_CFLAGS="-fPIC"
@@ -701,7 +694,7 @@ case $AFS_SYSNAME in
 		CC=$SOLARISCC
 		CCOBJ=$SOLARISCC
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		SHLIB_CFLAGS="-KPIC"
 		XCFLAGS="-dy -Bdynamic"
 		XLIBELFA="-lelf"
@@ -716,7 +709,7 @@ case $AFS_SYSNAME in
 		CC=$SOLARISCC
 		CCOBJ=$SOLARISCC
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -735,7 +728,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -754,7 +747,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -773,7 +766,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -792,7 +785,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -811,7 +804,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -830,7 +823,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -848,7 +841,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -866,7 +859,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -884,7 +877,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -902,7 +895,7 @@ case $AFS_SYSNAME in
 		CCOBJ=$SOLARISCC
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
-		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_CFLAGS='-mt'
 		PAM_CFLAGS="-KPIC"
 		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
 		SHLIB_CFLAGS="-KPIC"
@@ -916,6 +909,8 @@ case $AFS_SYSNAME in
 		;;
 esac
 
+MT_CFLAGS="${MT_CFLAGS} -DAFS_PTHREAD_ENV"
+
 #
 # Special build targets
 #