[vlc-devel] [PATCH 3/3] contrib: add Solaris to bootstrap

[Rémi Denis-Courmont]

Le jeudi 13 mars 2014, 13:50:27 Sean McGovern a écrit :
> ---
>  contrib/bootstrap    |    3 +++
>  contrib/src/main.mak |   10 ++++++++++
>  2 files changed, 13 insertions(+)
> 
> diff --git a/contrib/bootstrap b/contrib/bootstrap
> index 26e1c2c..2c755df 100755
> --- a/contrib/bootstrap
> +++ b/contrib/bootstrap
> @@ -265,6 +265,9 @@ case "${OS}" in
>  	*mingw*)
>  		add_make_enabled "HAVE_WIN32"
>  		;;
> +	*solaris*)
> +		add_make_enabled "HAVE_SOLARIS"
> +		;;
>  esac
> 
>  #
> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
> index 5b6ace3..0a12e94 100644
> --- a/contrib/src/main.mak
> +++ b/contrib/src/main.mak
> @@ -148,6 +148,16 @@ HAVE_MINGW_W64 := 1
>  endif
>  endif
> 
> +ifdef HAVE_SOLARIS
> +ifeq ($(ARCH),x86_64)
> +EXTRA_CFLAGS += -m64
> +EXTRA_LDFLAGS += -m64
> +else
> +EXTRA_CFLAGS += -m32
> +EXTRA_LDFLAGS += -m32
> +endif
> +endif

So $(CC) does not default to the correct architecture?!

> +
>  cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
> 
>  EXTRA_CFLAGS += -I$(PREFIX)/include

-- 
Rémi Denis-Courmont
http://www.remlab.net/