diff options
| author | Eric Anholt <eric@anholt.net> | 2012-07-26 09:35:36 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-07-26 17:30:06 -0700 |
| commit | 11ff18fcf5b92cee4a8e69425fc321f0ef272ecf (patch) | |
| tree | a17f2418cf102a3f3b58cc3f709af9154c9d7a4f | |
| parent | 87a1c4f233f597b8b366f7a2c0f1c5b7124d8d8e (diff) | |
automake: Remove OPT_FLAGS.
If you want to change your compiler arguments, just set CFLAGS/CXXFLAGS.
Having Mesa have this separate variable is a great way to have your arguments
not thoroughly propagated to all compiler invocations.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
| -rw-r--r-- | configs/current.in | 5 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/Makefile.am | 1 |
4 files changed, 4 insertions, 12 deletions
diff --git a/configs/current.in b/configs/current.in index 1840632e7ea..c4f3f4df9b3 100644 --- a/configs/current.in +++ b/configs/current.in @@ -9,15 +9,14 @@ CONFIG_NAME = autoconf # Compiler and flags CC = @CC@ CXX = @CXX@ -OPT_FLAGS = @OPT_FLAGS@ PIC_FLAGS = @PIC_FLAGS@ DEFINES = @DEFINES@ API_DEFINES = @API_DEFINES@ SHARED_GLAPI = @SHARED_GLAPI@ CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \ - $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) + $(PIC_FLAGS) $(DEFINES) CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \ - $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) + $(PIC_FLAGS) $(DEFINES) CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@ CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/configure.ac b/configure.ac index c81d18bb083..47b91872018 100644 --- a/configure.ac +++ b/configure.ac @@ -246,11 +246,6 @@ esac AC_SUBST([VISIBILITY_CFLAGS]) AC_SUBST([VISIBILITY_CXXFLAGS]) -dnl These should be unnecessary, but let the user set them if they want -AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler. - Default is to use CFLAGS.]) -AC_SUBST([OPT_FLAGS]) - dnl dnl Hacks to enable 32 or 64 bit build dnl @@ -2301,9 +2296,9 @@ echo " Static libs: $enable_static" dnl Compiler options # cleanup the CFLAGS/CXXFLAGS/DEFINES vars -cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS | \ +cflags=`echo $CFLAGS $PIC_FLAGS | \ $SED 's/^ *//;s/ */ /;s/ *$//'` -cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS | \ +cxxflags=`echo $CXXFLAGS $PIC_FLAGS | \ $SED 's/^ *//;s/ */ /;s/ *$//'` defines=`echo $DEFINES | $SED 's/^ *//;s/ */ /;s/ *$//'` echo "" diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am index ca2b6c06e43..79b17f6a947 100644 --- a/src/gallium/drivers/r300/Makefile.am +++ b/src/gallium/drivers/r300/Makefile.am @@ -16,7 +16,6 @@ AM_CFLAGS = \ $(LLVM_CFLAGS) \ $(RADEON_CFLAGS) \ $(DEFINES) \ - $(OPT_FLAGS) \ $(PIC_FLAGS) libr300_a_SOURCES = \ diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am index 65d0dff5dd7..628eaab5685 100644 --- a/src/gallium/drivers/r600/Makefile.am +++ b/src/gallium/drivers/r600/Makefile.am @@ -9,7 +9,6 @@ AM_CFLAGS = \ -I$(top_srcdir)/include \ $(RADEON_CFLAGS) \ $(DEFINES) \ - $(OPT_FLAGS) \ $(PIC_FLAGS) \ $(VISIBILITY_CFLAGS) |