diff options
| author |  Saleem Abdulrasool <compnerd@compnerd.org>
| 2016-01-14 11:22:19 -0800 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org>
| 2016-01-17 10:04:48 -0800 |
| commit | d34bba6a8a9457264a94326db3fdf84e69000dc9 (patch) | |
| tree | 906820dd61393324371325fced8eb38de308c90d | |
| parent | 77160677af68d46ac77ca56daf5a808e3f554bba (diff) | |
| download | paludis-d34bba6a8a9457264a94326db3fdf84e69000dc9.tar.gz paludis-d34bba6a8a9457264a94326db3fdf84e69000dc9.tar.xz | |
build: eradicate PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC
This variable was meant to home the CXXFLAGS without the warning options.
However, this has not been the case for some time now as CHECK_CXXFLAG will
implicitly modify PALUDIS_CXXFLAGS, resulting in the flags being pushed down
anyways and duplicating a set of warning flags. Simply use PALUDIS_CXXFLAGS
instead.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | ruby/Makefile.am | 6 | ||||
| -rw-r--r-- | ruby/demos/Makefile.am | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 5d020cce1..dab26fcc0 100644 --- a/configure.ac +++ b/configure.ac @@ -313,7 +313,6 @@ PALUDIS_CXXFLAGS_NO_WUNUSED= PALUDIS_CXXFLAGS_NO_WEXTRA= PALUDIS_CXXFLAGS_NO_WWRITE_STRINGS= PALUDIS_CXXFLAGS_NO_WMISSING_NORETURN= -PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC= PALUDIS_CXXFLAGS_NO_STRICT_ALIASING= PALUDIS_CXXFLAGS_VISIBILITY= @@ -390,10 +389,8 @@ if test x"$cxxflag_success" = x"no" ; then CHECK_CXXFLAG([-std=c++0x]) fi -PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC=$PALUDIS_CXXFLAGS AC_SUBST([PALUDIS_CXXFLAGS]) -AC_SUBST([PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC]) AC_SUBST([PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST]) AC_SUBST([PALUDIS_CXXFLAGS_NO_WSHADOW]) AC_SUBST([PALUDIS_CXXFLAGS_NO_WREDUNDANT_DECLS]) diff --git a/ruby/Makefile.am b/ruby/Makefile.am index a339ac571..b8c1c0553 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -4,11 +4,7 @@ SUBDIRS = . demos AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \ -I$(top_builddir)/ \ - @PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC@ \ - @PALUDIS_CXXFLAGS_NO_WMISSING_NORETURN@ \ - @PALUDIS_CXXFLAGS_NO_WREDUNDANT_DECLS@ \ - @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ \ - @PALUDIS_CXXFLAGS_NO_WSHADOW@ \ + @PALUDIS_CXXFLAGS@ \ @PALUDIS_CXXFLAGS_VISIBILITY@ DEFS= \ diff --git a/ruby/demos/Makefile.am b/ruby/demos/Makefile.am index 8194277a5..6872df57f 100644 --- a/ruby/demos/Makefile.am +++ b/ruby/demos/Makefile.am @@ -3,9 +3,7 @@ include $(top_srcdir)/misc/common-makefile.am SUBDIRS = . AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ -I$(top_srcdir)/ruby/ \ - @PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC@ \ - @PALUDIS_CXXFLAGS_NO_WREDUNDANT_DECLS@ \ - @PALUDIS_CXXFLAGS_NO_WOLD_STYLE_CAST@ + @PALUDIS_CXXFLAGS@ DEFS= \ -DSYSCONFDIR=\"$(sysconfdir)\" \ |