From 11e0ce535d094579c58247bd6274e058fb7cd71c Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 7 Sep 2012 13:51:29 +0100 Subject: [PATCH] comerr: Fix a couple of libtool problems The comerr libtool patch was submitted before buildbot had a chance to verify it. Fix a couple of problems that buildbot identified: *) On AIX liboafs_comerr needs to link against roken *) On OpenSuSe the LWP CC command has a space in it, so needs to be quoted before being passed in to lwptool Change-Id: I885099f57ef670ed58d532162b1cb70316744b28 Reviewed-on: http://gerrit.openafs.org/8059 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/comerr/Makefile.in | 2 +- src/config/Makefile.config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index 794d7afcd..4be49b077 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -11,7 +11,7 @@ include @TOP_OBJDIR@/src/config/Makefile.lwp LT_objs = error_msg.lo et_name.lo com_err.lo AFS_component_version_number.lo LT_deps = $(top_builddir)/src/opr/liboafs_opr.la -LT_libs = $(MT_LIBS) +LT_libs = $(LIB_roken) $(MT_LIBS) all: compile_et ${TOP_INCDIR}/afs/com_err.h ${TOP_INCDIR}/afs/error_table.h \ ${TOP_INCDIR}/afs/mit-sipb-cr.h ${TOP_LIBDIR}/libafscom_err.a \ diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index 99756e9f4..ecd15e961 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -234,7 +234,7 @@ LT_CCRULE=$(RUN_CC) $(LIBTOOL) --quiet --mode=compile --tag=CC \ # Libtool - for objects that are built for both pthread and lwp libraries LTLWP_CCRULE=$(RUN_CC) $(LWPTOOL) --mode compile \ - --lwpcc $(CCOBJ) \ + --lwpcc "$(CCOBJ)" \ --mtcc "$(LIBTOOL) --quiet --mode=compile --tag=CC $(MT_CC) $(MT_CFLAGS)" \ -o $@ \ -- \ -- 2.39.5