----- Original Message ----- > --- > configs/autoconf.in | 1 + > configure.ac | 1 + > src/gallium/state_trackers/xa/Makefile | 2 +- > src/gallium/targets/xa-vmwgfx/Makefile | 2 +- > 4 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/configs/autoconf.in b/configs/autoconf.in > index 9bbafc9..30d2df1 100644 > --- a/configs/autoconf.in > +++ b/configs/autoconf.in > @@ -21,6 +21,7 @@ CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \ > CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \ > $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) > CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@ > +USER_CFLAGS = @USER_CFLAGS@ > CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@ > LDFLAGS = @LDFLAGS@ > EXTRA_LIB_PATH = @EXTRA_LIB_PATH@ > diff --git a/configure.ac b/configure.ac > index 942084b..08b2ef6 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -20,6 +20,7 @@ AC_CANONICAL_HOST > dnl Save user CFLAGS and CXXFLAGS so one can override the default > ones > USER_CFLAGS="$CFLAGS" > USER_CXXFLAGS="$CXXFLAGS" > +AC_SUBST([USER_CFLAGS]) > > dnl Versions for external dependencies > LIBDRM_REQUIRED=2.4.24 > diff --git a/src/gallium/state_trackers/xa/Makefile > b/src/gallium/state_trackers/xa/Makefile > index d95f938..132a181 100644 > --- a/src/gallium/state_trackers/xa/Makefile > +++ b/src/gallium/state_trackers/xa/Makefile > @@ -32,7 +32,7 @@ OBJECTS = $(SOURCES:.c=.o) > ##### RULES ##### > > .c.o: > - $(CC) -c $(XA_CFLAGS) $(XA_INCLUDES) $< > + $(CC) -c $(XA_CFLAGS) $(USER_CFLAGS) $(XA_INCLUDES) $< > > > ##### TARGETS ##### > diff --git a/src/gallium/targets/xa-vmwgfx/Makefile > b/src/gallium/targets/xa-vmwgfx/Makefile > index fecdba6..3761f52 100644 > --- a/src/gallium/targets/xa-vmwgfx/Makefile > +++ b/src/gallium/targets/xa-vmwgfx/Makefile > @@ -40,7 +40,7 @@ endif > ##### RULES ##### > > .c.o: > - $(CC) -c $(XA_CFLAGS) $(XA_INCLUDES) $< > + $(CC) -c $(XA_CFLAGS) $(USER_CFLAGS) $(XA_INCLUDES) $<
This looks good, but I'm assuming this depends on the first patch? Cheers Jakob. _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
