Fix variable names to actually install tools and shared libraries when
selected. Make tools select shared libraries. Remove libHLSL, which is not
built, and libglslang-default-resource-limits, which was made static.
Signed-off-by: Philipp Zabel <p.za...@pengutronix.de>
---
rules/glslang.in | 1 +
rules/glslang.make | 6 ++----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/rules/glslang.in b/rules/glslang.in
index 5cdfb9a68268..367ae0cf7d65 100644
--- a/rules/glslang.in
+++ b/rules/glslang.in
@@ -13,6 +13,7 @@ if GLSLANG
config GLSLANG_TOOLS
bool
prompt "install tools"
+ select GLSLANG_LIBS
help
Install glslangValidator and spirv-remap tools.
diff --git a/rules/glslang.make b/rules/glslang.make
index 95811086a3f7..f5b5e53b2a4c 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -58,15 +58,13 @@ $(STATEDIR)/glslang.targetinstall:
@$(call install_fixup, glslang, AUTHOR, "Philipp Zabel
<p.za...@pengutronix.de>")
@$(call install_fixup, glslang, DESCRIPTION, Khronos-reference SPIR-V
generator)
-ifdef GLSLANG_TOOLS
+ifdef PTXCONF_GLSLANG_TOOLS
@$(call install_copy, glslang, 0, 0, 0755, -, /usr/bin/glslangValidator)
@$(call install_copy, glslang, 0, 0, 0755, -, /usr/bin/spirv-remap)
endif
-ifdef GLSLANG_LIBS
- @$(call install_lib, glslang, 0, 0, 0644,
libglslang-default-resource-limits)
+ifdef PTXCONF_GLSLANG_LIBS
@$(call install_lib, glslang, 0, 0, 0644, libglslang)
- @$(call install_lib, glslang, 0, 0, 0644, libHLSL)
@$(call install_lib, glslang, 0, 0, 0644, libSPIRV)
@$(call install_lib, glslang, 0, 0, 0644, libSPVRemapper)
endif
--
2.39.2
