From 50a4e5521aabe90afabe334f6bc2de890dc2a90d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 1 Feb 2009 16:10:50 -0600 Subject: [PATCH] Use explict libtool CC tag MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (sometimes libtool can't decide what tag is correct one if omited). Preserve CFLAGS/CPPFLAGS to allow: CPPFLAGS="-I$HOME/here-is-xfsprogs-installed/include" \ LDFLAGS="-L$HOME/here-is-xfsprogs-installed/lib" \ ./configure ... Signed-off-by: Arkadiusz Miśkiewicz Reviewed-by: Eric Sandeen --- include/builddefs.in | 4 +++- include/buildmacros | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/builddefs.in b/include/builddefs.in index d855c89e..636f6321 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -11,6 +11,8 @@ DEBUG = @debug_build@ OPTIMIZER = @opt_build@ MALLOCLIB = @malloc_lib@ LOADERFLAGS = @LDFLAGS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ LIBXFS = @libxfs@ LIBACL = @libacl@ @@ -75,7 +77,7 @@ ifeq ($(PKG_PLATFORM),freebsd) DEPENDFLAGS = -D__FreeBSD__ endif -GCFLAGS = $(OPTIMIZER) $(DEBUG) \ +GCFLAGS = $(OPTIMIZER) $(DEBUG) $(CPPFLAGS) \ -I$(TOPDIR)/include -DVERSION=\"$(PKG_VERSION)\" # Global, Platform, Local CFLAGS diff --git a/include/buildmacros b/include/buildmacros index 801bcb61..276d2c80 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -41,10 +41,10 @@ LIBNAME = $(basename $(LTLIBRARY)) LTOBJECTS = $(OBJECTS:.o=.lo) LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -LTLINK = $(LIBTOOL) --mode=link $(CC) +LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC) LTEXEC = $(LIBTOOL) --mode=execute LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF) ifeq ($(ENABLE_SHARED),yes) LTLDFLAGS += -rpath $(PKG_LIB_DIR) -- 2.47.3