From 87c47f752e29491b44439226403fe7727eb445a0 Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Mon, 5 Feb 2007 18:59:17 +0000
Subject: [PATCH] only use ar -rc for darwin, ld is faster the rest of the time

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1078 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/trunk/ceph/Makefile b/trunk/ceph/Makefile
index 81fcfc0858f1a..e30f421ea97c6 100644
--- a/trunk/ceph/Makefile
+++ b/trunk/ceph/Makefile
@@ -18,9 +18,11 @@ EXTRA_CFLAGS =
 ifeq ($(target),darwin)
 # For Darwin
 CFLAGS = -g -Wall -I. -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK -D_REENTRANT -D_THREAD_SAFE -DDARWIN -D__FreeBSD__=10 ${EXTRA_CFLAGS}
+LDINC = ar -rc
 else
 # For linux
 CFLAGS = -g -Wall -I. -D_FILE_OFFSET_BITS=64 -DMPICH_IGNORE_CXX_SEEK -D_REENTRANT -D_THREAD_SAFE 
+LDINC = ld -i -o
 endif
 
 CC = g++
@@ -177,7 +179,7 @@ test.ebofs: ebofs/test.ebofs.cc config.cc common/Clock.o ebofs.o
 
 # libceph
 libceph.o: client/ldceph.o client/Client.o ${COMMON_OBJS} ${SYN_OBJS} ${OSDC_OBJS}
-	ar -rc $@ $^
+	${LDINC} $@ $^
 
 bench/mdtest/mdtest.o: bench/mdtest/mdtest.c
 	mpicc -c $^ -o $@
@@ -197,28 +199,28 @@ clean:
 	rm -f *.o */*.o ${TARGETS} ${TEST_TARGETS}
 
 common.o: ${COMMON_OBJS}
-	ar -rc $@ $^
+	${LDINC} $@ $^
 
 ebofs.o: ${EBOFS_OBJS}
-	ar -rc $@ $^
+	${LDINC} $@ $^
 
 client.o: ${CLIENT_OBJS} 
-	ar -rc $@ $^
+	${LDINC} $@ $^
 
 osd.o: ${OSD_OBJS}
-	ar -rc $@ $^
+	${LDINC} $@ $^
 
 osdc.o: ${OSDC_OBJS}
-	ar -rc $@ $^
+	${LDINC} $@ $^
 
 osd_obfs.o: osd/OBFSStore.o osd/OSD.cc osd/PG.o osd/ObjectStore.o osd/FakeStore.o
 	${MPICC} -DUSE_OBFS ${MPICFLAGS} ${MPILIBS} $^ -o $@ ../uofs/uofs.o
 
 mds.o: ${MDS_OBJS}
-	ar -rc $@ $^
+	${LDINC} $@ $^
 
 mon.o: ${MON_OBJS}
-	ar -rc $@ $^
+	${LDINC} $@ $^
 
 %.o: %.cc
 	${CC} ${CFLAGS} -c $< -o $@
-- 
2.39.5