[Mesa-dev] [PATCH] builtin_compiler/build: Avoid using libtool if cross compiling

[Jonathan Liu]

Bump.

On 4 June 2013 23:03, Jonathan Liu <net147 at gmail.com> wrote:
> 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
> Signed-off-by: Jonathan Liu <net147 at gmail.com>
> ---
>  src/glsl/builtin_compiler/Makefile.am | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
>
> diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
> index e11a17f..8ebe0a2 100644
> --- a/src/glsl/builtin_compiler/Makefile.am
> +++ b/src/glsl/builtin_compiler/Makefile.am
> @@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
>  include ../Makefile.sources
>
>  noinst_PROGRAMS = builtin_compiler
> +
> +if !CROSS_COMPILING
>  noinst_LTLIBRARIES = libglslcore.la libglcpp.la
>
>  libglcpp_la_SOURCES =                                  \
> @@ -73,6 +75,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        \
> @@ -81,4 +84,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
> --
> 1.8.2.3
>