From: Noah Watkins <noahwatkins@gmail.com>
Date: Mon, 30 Dec 2013 20:10:53 +0000 (-0800)
Subject: make: add top-level libcommon dependency
X-Git-Tag: v0.75~14^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da5a082ec51634d0986cb9a83ba042863814f899;p=ceph.git

make: add top-level libcommon dependency

On OSX there is consistently a problem with resolving pipe_cloexec and other
symbols through indirect libtool dependencies (below libglobal has a dependency
on libcommon). This makes the dependency top-level for most executables.

  CXXLD    ceph_test_timers
Undefined symbols for architecture x86_64:
  "_pipe_cloexec", referenced from:
      AdminSocket::create_shutdown_pipe(int*, int*) in libglobal.a(admin_socket.o)
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index ef8a8f3b541e..5e914f403e93 100644
--- a/src/Makefile-env.am
+++ b/src/Makefile-env.am
@@ -178,7 +178,7 @@ LIBMDS += $(LIBPERFGLUE)
 LIBOS += -lleveldb -lsnappy
 
 # Use this for binaries requiring libglobal
-CEPH_GLOBAL = $(LIBGLOBAL) $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
+CEPH_GLOBAL = $(LIBGLOBAL) $(LIBCOMMON) $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS)
 
 # This is set by [lib]/Makefile.am and used for build tests
 LIBCOMMON_DEPS =