[Mesa-dev] [PATCH 17/18] swr: automake: attempt to fix the out-of-tree build

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Make sure that the output folder is created otherwise the python scripts
yells at us.

Cc: 0xe2.0x9a.0x9b at gmail.com
Cc: Tim Rowley <timothy.o.rowley at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96238
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---

This fixes the problem here, although the build barfs as below.

Tim, how are you building swr ? Is the following something on my end ?

/usr/lib/gcc/x86_64-pc-linux-gnu/6.1.1/include/popcntintrin.h: In function ‘void* swr_create_vs_state(pipe_context*, const pipe_shader_state*)’:
/usr/lib/gcc/x86_64-pc-linux-gnu/6.1.1/include/popcntintrin.h:35:1: error: inlining failed in call to always_inline ‘int _mm_popcnt_u32(unsigned int)’: target specific option mismatch
 _mm_popcnt_u32 (unsigned int __X)
 ^~~~~~~~~~~~~~
../../../../../src/gallium/drivers/swr/swr_state.cpp:344:28: note: called from here
              _mm_popcnt_u32(swr_vs->soState.streamMasks[i]);
              ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 src/gallium/drivers/swr/Makefile.am | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index 291b5b2..90dd040 100644
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -56,6 +56,7 @@ BUILT_SOURCES = \
 	rasterizer/jitter/builder_x86.h \
 	rasterizer/jitter/builder_x86.cpp
 
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h
 	$(PYTHON2) $(PYTHON_FLAGS) \
 		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
@@ -63,17 +64,20 @@ swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h
 		--output swr_context_llvm.h
 
 rasterizer/scripts/gen_knobs.cpp rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
+	$(MKDIR_GEN)
 	$(PYTHON2) $(PYTHON_FLAGS) \
 		$(srcdir)/rasterizer/scripts/gen_knobs.py \
 		rasterizer/scripts
 
 rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
+	$(MKDIR_GEN)
 	$(PYTHON2) $(PYTHON_FLAGS) \
 		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
 		--input $(srcdir)/rasterizer/core/state.h \
 		--output rasterizer/jitter/state_llvm.h
 
 rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+	$(MKDIR_GEN)
 	$(PYTHON2) $(PYTHON_FLAGS) \
 		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
 		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
@@ -81,6 +85,7 @@ rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
 		--gen_h
 
 rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+	$(MKDIR_GEN)
 	$(PYTHON2) $(PYTHON_FLAGS) \
 		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
 		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
@@ -88,12 +93,14 @@ rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.
 		--gen_cpp
 
 rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+	$(MKDIR_GEN)
 	$(PYTHON2) $(PYTHON_FLAGS) \
 		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
 		--output rasterizer/jitter/builder_x86.h \
 		--gen_x86_h
 
 rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+	$(MKDIR_GEN)
 	$(PYTHON2) $(PYTHON_FLAGS) \
 		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
 		--output rasterizer/jitter/builder_x86.cpp \
-- 
2.8.2