openkylin
/
make-it-quick
mirror of https://gitee.com/openkylin/make-it-quick.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Put the /dev/null in $(CAT) 

Also do not build library checks with $(CFG_CFLAGS), because they are
neither needed nor available at that point.
This commit is contained in:
Christophe de Dinechin 2017-11-28 16:48:57 +01:00
parent 4d5957d73d
commit 472c390157
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.gnu.mk
View File

@ -35,6 +35,7 @@ AR= $(CROSS_COMPILE:%=%-)ar -rcs
RANLIB= $(CROSS_COMPILE:%=%-)ranlib
LIBTOOL= libtool -no_warning_for_no_symbols
INSTALL= install
CAT= cat /dev/null
#------------------------------------------------------------------------------
@ -115,12 +116,12 @@ CFG_TEST= \
CFG_UNDEF0= \
| sed -e 's|^\#define \(.*\) 0$$|/* \#undef \1 */|g' > "$@"; \
[ -f "$<".out ] && cat >> "$@" "$<".out; true
CFG_CFLAGS= $(CFLAGS) $(shell cat $(PKG_CFLAGS) $(PKG_LDFLAGS) /dev/null)
CFG_CXXFLAGS= $(CXXFLAGS) $(shell cat $(PKG_CFLAGS) $(PKG_LDFLAGS) /dev/null)
CFG_CFLAGS= $(CFLAGS) $(shell $(CAT) $(PKG_CFLAGS) $(PKG_LDFLAGS))
CFG_CXXFLAGS= $(CXXFLAGS) $(shell $(CAT) $(PKG_CFLAGS) $(PKG_LDFLAGS))
CFG_CC_CMD= `$(CC) $(CFG_CFLAGS) $(CFLAGS_CONFIG_$*) $(CFG_TEST)`
CFG_CXX_CMD= `$(CXX) $(CFG_CXXFLAGS) $(CXXFLAGS_CONFIG_$*) $(CFG_TEST)`
CFG_LIB_CMD= `$(CC) $(CFG_CFLAGS) $(CFLAGS_CONFIG_$*) -l$* $(CFG_TEST)`
CFG_LIB_CMD= `$(CC) $(CFLAGS_CONFIG_$*) -l$* $(CFG_TEST)`
CFG_FN_CMD= `$(CC) $(CFG_CFLAGS) $(CFLAGS_CONFIG_$*) $(CFG_TEST)`
CC_CONFIG= $(CFG_DEF) HAVE_$(CFG_UPPER)_H $(CFG_CC_CMD) $(CFG_UNDEF0)

1
config.vs2013.mk
View File

@ -35,6 +35,7 @@ PYTHON= python
AR= no-ar-on-windows
RANLIB= no-ranlib-on-windows
INSTALL=install
CAT= type
#------------------------------------------------------------------------------

2
rules.mk
View File

@ -379,7 +379,7 @@ PKG_LIBS= $(patsubst %,$(OBJDIR)%.cfg.ldflags,$(filter lib%,$(CONFIG)))
PKG_DEPS= $(MAKEFILE_DEPS) $(OBJDIR).mkdir
$(OBJDIR)pkg-config.mk: $(PKG_CFLAGS) $(PKG_LDFLAGS) $(PKG_LIBS)
$(PRINT_COMMAND) (echo CFLAGS_PKGCONFIG=`cat $(PKG_CFLAGS)`; echo LDFLAGS_PKGCONFIG=`cat $(PKG_LDFLAGS) $(PKG_LIBS)`) > $@
$(PRINT_COMMAND) (echo CFLAGS_PKGCONFIG=`$(CAT) $(PKG_CFLAGS)`; echo LDFLAGS_PKGCONFIG=`$(CAT) $(PKG_LDFLAGS) $(PKG_LIBS)`) > $@
-include $(PKGCONFIGS:%=$(OBJDIR)pkg-config.mk)
$(OBJDIR)%?.pkg-config.cflags: $(PKG_DEPS)