From 67f01c2553067a4b7592a34917ce5a5148b67142 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 11 Feb 2011 11:53:26 +0000 Subject: [PATCH] Clarify the role of XCFLAGS and simplify MT_CFLAGS Tidy up the build system by making it clear that XCFLAGS is included for every build type. Also clean up MT_CFLAGS so that it doesn't statically include XCFLAGS, and remove the common AFS_PTHREAD_ENV define that's needed by every architecture. This fixes the problem that we had where directories built with the pthread or shared build rules weren't being compiled with checking enabled, as well as hopefully making the tangle of defines easier to understand. Change-Id: Ied6dd316147ee88dc7814f8937a204ef32c6c5e0 Reviewed-on: http://gerrit.openafs.org/4171 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/cf/osconf.m4 | 2 +- src/config/Makefile.config.in | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 76b769814..c2cd974bf 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -468,7 +468,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="-DAFS_PTHREAD_ENV -D_REENTRANT \${XCFLAGS} \${ARCHFLAGS}" MT_LIBS='${XLIBS}' KROOT= KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers' diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index 3c6df7f92..91de5e9dd 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -143,13 +143,14 @@ SHELL = /bin/sh COMMON_INCL=$(MODULE_INCLUDE) -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} \ -I${srcdir} -I. -COMMON_CFLAGS=$(CFLAGS) ${DBG} ${OPTMZ} ${COMMON_INCL} ${INCLUDE_LIBINTL} \ - $(CPPFLAGS_roken) +COMMON_CFLAGS=$(CFLAGS) ${DBG} ${OPTMZ} $(XCFLAGS) \ + ${COMMON_INCL} ${INCLUDE_LIBINTL} \ + $(CPPFLAGS_roken) $(ARCHFLAGS) COMMON_LDFLAGS=$(LDFLAGS) $(LDFLAGS_hcrypto) $(LDFLAGS_roken) $(DBG) $(OPTMZ) # LWP Flags -LWP_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(XCFLAGS) $(ARCHFLAGS) +LWP_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) LWP_LDFLAGS=$(COMMON_LDFLAGS) $(MODULE_LDFLAGS) $(XLDFLAGS) $(ARCHFLAGS) LWP_CCRULE=$(CCOBJ) $(LWP_CFLAGS) $(CFLAGS_$(@)) -o $@ -c -- 2.39.5