moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 07:48:50 -05:00
Code Issues Releases Wiki Activity

buildsys: define warning CFLAGS in separate var

Browse Source 
Continue the trend of not touching the environment CFLAGS, ensuring that
the user always has the final say.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
This commit is contained in:
Dave Reisner 2012-03-30 23:26:32 -04:00
parent 7fcb445f35
commit 793eff3704
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -350,10 +350,10 @@ if test "x$debug" = "xyes" ; then
GCC_STACK_PROTECT_LIB GCC_STACK_PROTECT_LIB
GCC_STACK_PROTECT_CC GCC_STACK_PROTECT_CC
GCC_FORTIFY_SOURCE_CC GCC_FORTIFY_SOURCE_CC
CFLAGS="$CFLAGS -g -Wall -Werror" WARNING_CFLAGS="-g -Wall -Werror"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
CFLAGS="$CFLAGS -Wall" WARNING_CFLAGS="-Wall"
fi fi
# Enable or disable use of git version in pacman version string # Enable or disable use of git version in pacman version string
@ -424,7 +424,7 @@ ${PACKAGE_NAME}:
compiler : ${CC} compiler : ${CC}
preprocessor flags : ${CPPFLAGS} preprocessor flags : ${CPPFLAGS}
compiler flags : ${CFLAGS} compiler flags : ${WARNING_CFLAGS} ${CFLAGS}
defines : ${DEFS} defines : ${DEFS}
library flags : ${LIBS} ${LIBSSL_LIBS} ${LIBARCHIVE_LIBS} ${LIBCURL_LIBS} ${GPGME_LIBS} library flags : ${LIBS} ${LIBSSL_LIBS} ${LIBARCHIVE_LIBS} ${LIBCURL_LIBS} ${GPGME_LIBS}
linker flags : ${LDFLAGS} linker flags : ${LDFLAGS}

2
lib/libalpm/Makefile.am
View File

@ -10,7 +10,7 @@ DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-imacros $(top_builddir)/config.h -imacros $(top_builddir)/config.h
AM_CFLAGS = -pedantic -D_GNU_SOURCE AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS)
if ENABLE_VISIBILITY_CC if ENABLE_VISIBILITY_CC
if DARWIN if DARWIN

2
src/pacman/Makefile.am
View File

@ -21,7 +21,7 @@ AM_CPPFLAGS = \
-imacros $(top_builddir)/config.h \ -imacros $(top_builddir)/config.h \
-I$(top_srcdir)/lib/libalpm -I$(top_srcdir)/lib/libalpm
AM_CFLAGS = -pedantic -D_GNU_SOURCE AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS)
if USE_GIT_VERSION if USE_GIT_VERSION
GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//')

2
src/util/Makefile.am
View File

@ -17,7 +17,7 @@ AM_CPPFLAGS = \
-imacros $(top_builddir)/config.h \ -imacros $(top_builddir)/config.h \
-I$(top_srcdir)/lib/libalpm -I$(top_srcdir)/lib/libalpm
AM_CFLAGS = -pedantic -D_GNU_SOURCE AM_CFLAGS = -pedantic -D_GNU_SOURCE $(WARNING_CFLAGS)
cleanupdelta_SOURCES = cleanupdelta.c cleanupdelta_SOURCES = cleanupdelta.c
cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la