builtin_compiler/build: Avoid using libtool if cross compiling

Adds the dependencies of builtin_compiler as sources when cross
compiling instead of using libtool to share compilation with src/glsl.
The builtin_compiler executable is built for the host when cross
compiling so it doesn't make sense to share compilation with src/glsl
built for the target in this case.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44618
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>

diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
index 823d546e15225670a47711d34313817e0d534b2a..5f1a995c3ac0acecb28608ada021aff117faa469 100644 (file)
--- a/src/glsl/builtin_compiler/Makefile.am
+++ b/src/glsl/builtin_compiler/Makefile.am
@@ -65,6 +65,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
 include ../Makefile.sources
 
 noinst_PROGRAMS = builtin_compiler
+
+if !CROSS_COMPILING
 noinst_LTLIBRARIES = libglslcore.la libglcpp.la
 
 libglcpp_la_SOURCES =                                  \
@@ -74,6 +76,7 @@ libglcpp_la_SOURCES =                                 \
 libglslcore_la_SOURCES =                               \
        $(BUILTIN_COMPILER_GENERATED_CXX_FILES)         \
        $(LIBGLSL_FILES)
+endif
 
 builtin_compiler_SOURCES = \
        $(top_srcdir)/src/mesa/main/hash_table.c        \
@@ -82,4 +85,14 @@ builtin_compiler_SOURCES = \
        $(top_srcdir)/src/mesa/program/symbol_table.c   \
        $(BUILTIN_COMPILER_CXX_FILES)                   \
        $(GLSL_COMPILER_CXX_FILES)
+
+if CROSS_COMPILING
+builtin_compiler_SOURCES += \
+       $(LIBGLCPP_GENERATED_FILES) \
+       $(LIBGLCPP_FILES) \
+       $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
+       $(LIBGLSL_FILES)
+builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS)
+else
 builtin_compiler_LDADD = libglslcore.la libglcpp.la
+endif