----- Original Message -----
> Updated Branches:
> refs/heads/master 54b532b64 -> d8c526233
>
>
> TS-1864 Rearrange some of the autoconf code, order matters
>
[snip]
> Branch: refs/heads/master
> Commit: d8c5262331e0654097640982100f43731e7e8f6d
> Parents: 54b532b
> Author: Leif Hedstrom <[email protected]>
> Authored: Mon Apr 29 17:00:51 2013 -0600
> Committer: Leif Hedstrom <[email protected]>
> Committed: Mon Apr 29 22:07:27 2013 -0600
> --- a/configure.ac
> +++ b/configure.ac
> @@ -674,10 +720,10 @@ AM_CONDITIONAL([BUILD_HAVE_LIBCXX], [ false ])
>
> base_cc=`basename $CC`
> # These are shortcuts used in combination for the compiler options
> below
I hope we can all agree that using the compilers name on the
filesystem is a BAD way determine which compiler we're dealing with.
> -case $host_os in
> - linux*)
> +case $host_os_def in
> + linux)
> case $base_cc in
> - icc)
> + *icc*)
> # -Wall goes crazy, so turned these specific checks off for
> now:
> #
> # 111 is "statement is unrecahable"
> @@ -700,7 +746,7 @@ case $host_os in
> release_opt="-g $common_opt $optimization_flags -axsse4.2
> -fno-strict-aliasing"
> cxx_opt="-Wno-invalid-offsetof"
> ;;
> - clang)
> + *clang*)
> debug_opt="-ggdb3 $common_opt -Werror -Qunused-arguments"
> release_opt="-g $common_opt $optimizing_flags
> -fno-strict-aliasing -Werror -Qunused-arguments"
> cxx_opt="-Wno-invalid-offsetof -Werror -Qunused-arguments"
> @@ -717,10 +763,10 @@ case $host_os in
> flex_cflags="-Wno-unused-parameter"
> ;;
> esac
> - ;; # linux*)
> - darwin*)
> + ;; # linux)
> + darwin)
> case $base_cc in
> - clang)
> + *clang*)
> common_opt="-pipe -Wall -Werror -Wno-deprecated-declarations"
> debug_opt="$common_opt"
> release_opt="-g $common_opt $optimizing_flags
> -fno-strict-aliasing"
> @@ -738,10 +784,10 @@ case $host_os in
> # ToDo: This seems semi-kludgy, but useful for MacPort's I
> think.
> TS_ADDTO(CPPFLAGS, [-I/opt/local/include])
> TS_ADDTO(LDFLAGS, [-L/opt/local/lib])
> - ;; # darwin*)
> - freebsd*|kfreebsd*)
> + ;; # darwin)
> + freebsd|kfreebsd)
> case $base_cc in
> - clang)
> + *clang*)
> common_opt="-pipe -Wall -Werror -Qunused-arguments"
> debug_opt="-ggdb3 $common_opt"
> release_opt="-g $common_opt $optimizing_flags
> -feliminate-unused-debug-symbols -fno-strict-aliasing"
> @@ -755,10 +801,11 @@ case $host_os in
> ;;
> esac
> TS_ADDTO(LDFLAGS, [-L/usr/local/lib])
> - ;;
> - solaris*)
> + ;; # freebsd|kfreebsd)
> + solaris)
> if test "x${base_cc}" = "xcc"; then
> - common_opt="-mt -m64 -D__WORDSIZE=64" # FIXME: arch should be
> detected
> + # TODO: If we no longer support SunStudio, should this code go
> away?
> + common_opt="-mt -D__WORDSIZE=64" # FIXME: arch should be
> detected
> debug_opt="-g $common_opt"
> release_opt="-g $common_opt $optimizing_flags"
> cxx_opt="-library=stlport4"
> @@ -771,11 +818,11 @@ case $host_os in
> postdeps_CXX="-library=Crun"
> fi
> else # gcc
> - common_opt="-pipe -Wall -Werror -m64"
> + common_opt="-pipe -Wall -Werror"
> debug_opt="-ggdb3 $common_opt"
> release_opt="-g $common_opt $optimizing_flags
> -feliminate-unused-debug-symbols -fno-strict-aliasing"
> cxx_opt="-Wno-invalid-offsetof"
> - fi
> + fi # solaris)
> ;;
> *)
> common_opt="-pipe -Wall -Werror"
> @@ -802,26 +849,27 @@ SHARED_LDFLAGS=-shared
-- i
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: [email protected]
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
