Use explict libtool CC tag
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Sun, 1 Feb 2009 22:10:50 +0000 (16:10 -0600)
committerEric Sandeen <sandeen@sandeen.net>
Sun, 1 Feb 2009 22:10:50 +0000 (16:10 -0600)
(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 <arekm@maven.pl>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
include/builddefs.in
include/buildmacros

index d855c89ec46ac47e95ec63bb7db1766ca9041139..636f63212a5134026d54346dab7ffb574a76e506 100644 (file)
@@ -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
index 801bcb618ce5994b678b7206522467d115675769..276d2c800e73f1860e31f1d5cba6d986b81c8c62 100644 (file)
@@ -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)