From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 2 Nov 2011 16:35:42 +0000 (-0500)
Subject: Solaris: Specify ARCHFLAGS in CFLAGS
X-Git-Tag: upstream/1.6.1.pre1^2~92
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1132b23e2fe62ffca875bd9bcacee621d292cea4;p=packages%2Fo%2Fopenafs.git

Solaris: Specify ARCHFLAGS in CFLAGS

Various autoconf tests which use the C compiler may yield different
results depending on whether or not we are compiling for x86 or amd64
on Solaris (different libraries are available, structures may be
different, et al). So, set CFLAGS depending on which arch we are
targeting, so the autoconf results are more consistent with the actual
compilation during the build.

Reviewed-on: http://gerrit.openafs.org/5786
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 5eba97a8960c49aeea957dc94408368e1324eff0)

Change-Id: Idd0f7d2220ae9762af60e96d087e7eb7ee8c0e63
Reviewed-on: http://gerrit.openafs.org/6086
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index efe2fa7ea..a42d33b24 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -688,6 +688,7 @@ case $AFS_SYSNAME in
 	sunx86_510)
 		CC=$SOLARISCC
 		CCOBJ=$SOLARISCC
+		CFLAGS="$CFLAGS $XARCHFLAGS"
 		LD="/usr/ccs/bin/ld"
 		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'