emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc.mk: move debug.mk out of end Makefiles

Browse Source 
Since we always want debug.mk whenever we include cc.mk, move the include
out of the Makefiles and into cc.mk itself.  This also fixes an include
order bug in rc/Makefile where debug.mk is included before cc.mk and
breaks the default CFLAGS setup in cc.mk.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-05-28 12:00:34 -04:00
parent 98d3b407fe
commit 227f831639
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/cc.mk
View File

@ -31,3 +31,5 @@ _CC_FLAGS_SH= for f in ${_CCFLAGS}; do \
done; done;
_CC_FLAGS:= $(shell ${_CC_FLAGS_SH}) _CC_FLAGS:= $(shell ${_CC_FLAGS_SH})
CFLAGS+= ${_CC_FLAGS} CFLAGS+= ${_CC_FLAGS}
include ${MK}/debug.mk

1
src/libeinfo/Makefile
View File

@ -9,5 +9,4 @@ CPPFLAGS+= -I../includes
MK= ../../mk MK= ../../mk
include ${MK}/lib.mk include ${MK}/lib.mk
include ${MK}/cc.mk include ${MK}/cc.mk
include ${MK}/debug.mk
include ${MK}/termcap.mk include ${MK}/termcap.mk

1
src/librc/Makefile
View File

@ -12,7 +12,6 @@ CPPFLAGS+= -I../includes
MK= ../../mk MK= ../../mk
include ${MK}/lib.mk include ${MK}/lib.mk
include ${MK}/cc.mk include ${MK}/cc.mk
include ${MK}/debug.mk
# Massage our header file for our dirs # Massage our header file for our dirs
SED_CMD= -e 's:@PREFIX@:${PREFIX}:g' SED_CMD= -e 's:@PREFIX@:${PREFIX}:g'

1
src/rc/Makefile
View File

@ -36,7 +36,6 @@ LDADD+= -lutil -lrc -leinfo
include ../../Makefile.inc include ../../Makefile.inc
MK= ../../mk MK= ../../mk
include ${MK}/debug.mk
include ${MK}/prog.mk include ${MK}/prog.mk
include ${MK}/git.mk include ${MK}/git.mk
include ${MK}/cc.mk include ${MK}/cc.mk