https://bugs.freedesktop.org/show_bug.cgi?id=56685
--- Comment #7 from Thierry Reding <thierry.red...@avionic-design.de> --- Comment on attachment 69667 --> https://bugs.freedesktop.org/attachment.cgi?id=69667 Possible Fix Review of attachment 69667: ----------------------------------------------------------------- I came up with a very similar, though simpler patch that I've successfully tested on top of latest master, both in-tree and out-of-tree as well as parallel and non-parallel builds. With the below comments applied, Johannes' patch becomes effectively the same as mine. ::: src/glsl/builtin_compiler/Makefile.am @@ +29,4 @@ > LD = @LD_FOR_BUILD@ > LDFLAGS = @LDFLAGS_FOR_BUILD@ > > +include ../Makefile.sources You don't need to move the Makefile.sources include because GLSL_SRCDIR, GLSL_BUILDDIR and AM_CFLAGS are all lazily evaluated. Don't forget to remove the corresponding comment in the commit message. @@ +36,5 @@ > -I $(top_srcdir)/src/mapi \ > -I $(top_srcdir)/src/mesa \ > -I $(GLSL_SRCDIR) \ > -I $(GLSL_SRCDIR)/glcpp \ > + -I $(GLSL_BUILDDIR) \ Can we please sort this above GLSL_SRCDIR so that files in GLSL_BUILDDIR will take precedence? -- You are receiving this mail because: You are the assignee for the bug.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
