From e6aa586a996e32b3def4b8108815730fcfbf1463 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Mon, 16 Jul 2012 15:16:53 -0400 Subject: [PATCH] macos: future-proof MakefileProto.DARWIN.in if new cases show up which match the current ones, they just work. darwin60 and older were already killed from the tree, kill here also Change-Id: Id246e13985c4752e99f606efd009bc5ce2871691 Reviewed-on: http://gerrit.openafs.org/7782 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/libafs/MakefileProto.DARWIN.in | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in index 46b04c2e5..b03e77a29 100644 --- a/src/libafs/MakefileProto.DARWIN.in +++ b/src/libafs/MakefileProto.DARWIN.in @@ -42,13 +42,13 @@ DBUG = DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL KINCLUDES=-I${KROOT}/System/Library/Frameworks/Kernel.framework/Headers - + KOPTS_DBUG=-g KOPTS_DBUG=-ggdb - + KOPTS_DBUG=-gdwarf-2 - + KOPTS_ppc=-static -nostdinc -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch ppc -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED -mcpu=750 -mmultiple -fschedule-insns -force_cpusubtype_ALL KOPTS_x86=-static -nostdinc -fmessage-length=0 -pipe -nostdinc -fno-builtin -Wno-trigraphs -force_cpusubtype_ALL -msoft-float -O0 -fno-common -mkernel -finline -fno-keep-inline-functions -fasm-blocks -arch i386 -Di386 -DI386 -D__I386__ -DPAGE_SIZE_FIXED KOPTS_amd64=-static -nostdinc -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch x86_64 -Damd64 -DAMD64 -D__AMD64__ -DPAGE_SIZE_FIXED -march=x86-64 -mpreferred-stack-boundary=4 -falign-functions=4 -m64 -mkernel -mno-red-zone @@ -59,9 +59,9 @@ OBJ_ppc=$(shell echo "${ARCH_ppc}" | grep -q -w yes && echo "$@.ppc") OBJ_x86=$(shell echo "${ARCH_x86}" | grep -q -w yes && echo "$@.x86") OBJ_amd64=$(shell echo "${ARCH_amd64}" | grep -q -w yes && echo "$@.amd64") - + MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib $(ARCHFLAGS) -Xlinker -kext - + MODLD=$(CC) -static $(KOPTS_DBUG) -nostdlib $(ARCHFLAGS) @@ -80,7 +80,7 @@ DESTDIRS = single_destdir include Makefile.common - + # override suffix rule; unfortunately, this causes a warning message .c.o: if [ "$(ARCH_ppc)" = "yes" ]; then \ @@ -104,14 +104,9 @@ CRULE_OPT_x86=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_x86) $( CRULE_OPT_amd64=$(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_amd64) $(CFLAGS-$@) -o $(patsubst %.o,%.o.amd64,$@) -c $? CRULE_OPT=$(shell echo "${ARCH_ppc}" | grep -q -w yes && echo "${CRULE_OPT_ppc} && "; echo "${ARCH_x86}" | grep -q -w yes && echo "${CRULE_OPT_x86} && "; echo "${ARCH_amd64}" | grep -q -w yes && echo "${CRULE_OPT_amd64} && ";echo "lipo -create ${OBJ_ppc} ${OBJ_x86} ${OBJ_amd64} -output $@ && true") - -CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS) +CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS) KOPTS=-static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch - -KOPTS=-no-cpp-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch - -KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch setup: @@ -133,14 +128,14 @@ INST_LIBAFS = ${DESTDIR}${afskerneldir}/afs-nfs.kext INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/afs.kext DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/afs-nfs.kext DEST_LIBAFSNONFS = ${DEST}/root.client/usr/vice/etc/afs.kext - + LIBAFSDSYM = LIBAFSNONFSDSYM = INST_LIBAFSDSYM = INST_LIBAFSNONFSDSYM = DEST_LIBAFSDSYM = DEST_LIBAFSNONFSDSYM = - + LIBAFSDSYM = libafs.o.dSYM LIBAFSNONFSDSYM = libafs.nonfs.o.dSYM INST_LIBAFSDSYM = ${DESTDIR}${afskerneldir}/afs-nfs.kext.dSYM @@ -156,7 +151,7 @@ install_libafs: $(LIBAFSNONFS) $(LIBAFSNONFSDSYM) ; $(INSTALL) -m 644 ../${DARWIN_INFOFILE} ${INST_LIBAFSNONFS}/Contents/Info.plist -mkdir -p ${INST_LIBAFSNONFS}/Contents/MacOS $(INSTALL) -m 644 ${LIBAFSNONFS} ${INST_LIBAFSNONFS}/Contents/MacOS/afs - + -mkdir -p ${INST_LIBAFSNONFSDSYM}/Contents/Resources/DWARF $(INSTALL) ${LIBAFSNONFSDSYM}/Contents/Info.plist ${INST_LIBAFSNONFSDSYM}/Contents $(INSTALL) ${LIBAFSNONFSDSYM}/Contents/Resources/DWARF/${LIBAFSNONFS} ${INST_LIBAFSNONFSDSYM}/Contents/Resources/DWARF @@ -168,7 +163,7 @@ dest_libafs: $(LIBAFSNONFS) $(LIBAFSNONFSDSYM) ; $(INSTALL) -m 644 ../${DARWIN_INFOFILE} ${DEST_LIBAFSNONFS}/Contents/Info.plist -mkdir -p ${DEST_LIBAFSNONFS}/Contents/MacOS $(INSTALL) -m 644 ${LIBAFSNONFS} ${DEST_LIBAFSNONFS}/Contents/MacOS/afs - + -mkdir -p ${DEST_LIBAFSNONFSDSYM}/Contents/Resources/DWARF $(INSTALL) ${LIBAFSNONFSDSYM}/Contents/Info.plist ${DEST_LIBAFSNONFSDSYM}/Contents $(INSTALL) ${LIBAFSNONFSDSYM}/Contents/Resources/DWARF/${LIBAFSNONFS} ${DEST_LIBAFSNONFSDSYM}/Contents/Resources/DWARF @@ -180,7 +175,7 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS) ${LIBAFSNONFS}: $(AFSAOBJS) $(AFSNONFSOBJS) $(MODLD) -r -o ${LIBAFSNONFS} ${AFSAOBJS} ${AFSNONFSOBJS} -lcc_kext - + $(LIBAFSDSYM): ${LIBAFS} dsymutil -o ${LIBAFS}.dSYM ${LIBAFS} ${LIBAFSNONFSDSYM}: ${LIBAFSNONFS} -- 2.39.5