From: Emil Velikov <[email protected]> Otherwise things will fail to build, if the builder is using another version of LLVM.
Cc: "12.0" <[email protected]> Cc: Tim Rowley <[email protected]> Cc: Chuck Atkins <[email protected]> Reported-by: Chuck Atkins <[email protected]> Signed-off-by: Emil Velikov <[email protected]> --- Tim, Chuck, Can anyone confirm if these are the only files that need this workaround ? If you want I can whip up (and upload) an Archlinux generated tarball for you to test. Thanks Emil --- src/gallium/drivers/swr/Makefile.am | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index 8151e4a..b6c58b0 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -52,8 +52,6 @@ BUILT_SOURCES = \ rasterizer/scripts/gen_knobs.cpp \ rasterizer/scripts/gen_knobs.h \ rasterizer/jitter/state_llvm.h \ - rasterizer/jitter/builder_gen.h \ - rasterizer/jitter/builder_gen.cpp \ rasterizer/jitter/builder_x86.h \ rasterizer/jitter/builder_x86.cpp @@ -132,6 +130,15 @@ libswrAVX_la_CXXFLAGS = \ libswrAVX_la_SOURCES = \ $(COMMON_SOURCES) +# XXX: Don't ship these generated sources for now, since they are specific +# to the LLVM version they are generated from. Thus a release tarball +# containing the said files, generated against eg. LLVM 3.8 will fail to build +# on systems with other versions of LLVM eg. 3.7 or 3.6. +# Move these back to BUILT_SOURCES once that is resolved. +nodist_libswrAVX_la_SOURCES = \ + rasterizer/jitter/builder_gen.h \ + rasterizer/jitter/builder_gen.cpp + libswrAVX_la_LIBADD = \ $(COMMON_LIBADD) @@ -146,6 +153,15 @@ libswrAVX2_la_CXXFLAGS = \ libswrAVX2_la_SOURCES = \ $(COMMON_SOURCES) +# XXX: Don't ship these generated sources for now, since they are specific +# to the LLVM version they are generated from. Thus a release tarball +# containing the said files, generated against eg. LLVM 3.8 will fail to build +# on systems with other versions of LLVM eg. 3.7 or 3.6. +# Move these back to BUILT_SOURCES once that is resolved. +nodist_libswrAVX2_la_SOURCES = \ + rasterizer/jitter/builder_gen.h \ + rasterizer/jitter/builder_gen.cpp + libswrAVX2_la_LIBADD = \ $(COMMON_LIBADD) -- 2.8.2 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
