Reviewed-by: Marek Olšák <[email protected]> Marek
On Thu, Feb 9, 2017 at 9:07 AM, Michel Dänzer <[email protected]> wrote: > From: Michel Dänzer <[email protected]> > > Drop all -m*, -W*, -O*, -g* and -f* flags, with the exception of > -fno-rtti, which must be used if it's part of the llvm-config --cxxflags > output. We don't want LLVM to dictate the flags we use, and it can even > cause build failures, e.g. if LLVM and Mesa are built with different > compilers. > > While we're at it, eat any whitespace preceding dropped flags as well. > > Signed-off-by: Michel Dänzer <[email protected]> > --- > configure.ac | 33 ++++++++++++--------------------- > 1 file changed, 12 insertions(+), 21 deletions(-) > > diff --git a/configure.ac b/configure.ac > index a6ceee95a3..87a751e2fa 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -894,27 +894,18 @@ llvm_add_target() { > # $1 is the llvm-config command with arguments. > strip_unwanted_llvm_flags() { > # Use \> (marks the end of the word) > - echo `$1` | sed \ > - -e 's/-march=\S*//g' \ > - -e 's/-mtune=\S*//g' \ > - -e 's/-mcpu=\S*//g' \ > - -e 's/-DNDEBUG\>//g' \ > - -e 's/-D_GNU_SOURCE\>//g' \ > - -e 's/-pedantic\>//g' \ > - -e 's/-Wcovered-switch-default\>//g' \ > - -e 's/-O.\>//g' \ > - -e 's/-g\>//g' \ > - -e 's/-Wall\>//g' \ > - -e 's/-Wcast-qual\>//g' \ > - -e 's/-Woverloaded-virtual\>//g' \ > - -e 's/-fcolor-diagnostics\>//g' \ > - -e 's/-fdata-sections\>//g' \ > - -e 's/-ffunction-sections\>//g' \ > - -e 's/-fno-exceptions\>//g' \ > - -e 's/-fomit-frame-pointer\>//g' \ > - -e 's/-fvisibility-inlines-hidden\>//g' \ > - -e 's/-fPIC\>//g' \ > - -e 's/-fstack-protector-strong\>//g' > + echo " `$1`" | sed \ > + -e 's/\s\+-m\S*//g' \ > + -e 's/\s\+-DNDEBUG\>//g' \ > + -e 's/\s\+-D_GNU_SOURCE\>//g' \ > + -e 's/\s\+-pedantic\>//g' \ > + -e 's/\s\+-W\S*//g' \ > + -e 's/\s\+-O\S*//g' \ > + -e 's/\s\+-g\S*//g' \ > + -e 's/-fno-rtti\>/-Fno-rtti/g' \ > + -e 's/\s\+-f\S*//g' \ > + -e 's/-Fno-rtti\>/-fno-rtti/g' \ > + -e 's/^ //' > } > > llvm_set_environment_variables() { > -- > 2.11.0 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
