diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-02 15:28:26 -0500 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-03-04 12:52:00 +0000 |
| commit | 6398cf9f874cf0879151d70e9f63f7b8d53b30e0 (patch) | |
| tree | aeaccb3826d0bb2fd99dd5ec0886b0179d354329 /configure.ac | |
| parent | Delete double condition check (diff) | |
| download | core-6398cf9f874cf0879151d70e9f63f7b8d53b30e0.tar.gz core-6398cf9f874cf0879151d70e9f63f7b8d53b30e0.zip | |
do not require cygwin gcc
Change-Id: I29de91f2eeb5c9317271aecf861f64a3c8eff73f
Reviewed-on: https://gerrit.libreoffice.org/2521
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 68 |
1 files changed, 28 insertions, 40 deletions
diff --git a/configure.ac b/configure.ac index ed90a4b0bac5..abe1ee8d485b 100644 --- a/configure.ac +++ b/configure.ac @@ -2158,20 +2158,6 @@ else SOLARVER=${BUILDDIR}/solver fi -dnl =================================================================== -dnl Extra check for Windows. Cygwin builds need gcc to build concat-deps -dnl although MSVC is used to build other build-time tools and -dnl LibreOffice itself. -dnl =================================================================== -if test "$build_os" = "cygwin"; then - AC_MSG_CHECKING([for Cygwin gcc/g++]) - if which gcc > /dev/null && which g++ > /dev/null; then - AC_MSG_RESULT([found]) - else - AC_MSG_ERROR([Cygwin gcc and g++ are needed, please install them.]) - fi -fi - # remenber SYSBASE value AC_SUBST(SYSBASE) @@ -2242,32 +2228,34 @@ dnl =================================================================== dnl Checks for C compiler, dnl The check for the C++ compiler is later on. dnl =================================================================== -GCC_HOME_SET="true" -AC_MSG_CHECKING([gcc home]) -if test -z "$with_gcc_home"; then - if test "$enable_icecream" = "yes"; then - if test -d "/usr/lib/icecc/bin"; then - GCC_HOME="/usr/lib/icecc/" - else - GCC_HOME="/opt/icecream/" - fi - else - GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,` - GCC_HOME_SET="false" - fi -else - GCC_HOME="$with_gcc_home" -fi -AC_MSG_RESULT($GCC_HOME) -AC_SUBST(GCC_HOME) - -if test "$GCC_HOME_SET" = "true"; then - if test -z "$CC"; then - CC="$GCC_HOME/bin/gcc" - fi - if test -z "$CXX"; then - CXX="$GCC_HOME/bin/g++" - fi +if test "$_os" != "WINNT" -a "$WITH_MINGW" != "yes"; then + GCC_HOME_SET="true" + AC_MSG_CHECKING([gcc home]) + if test -z "$with_gcc_home"; then + if test "$enable_icecream" = "yes"; then + if test -d "/usr/lib/icecc/bin"; then + GCC_HOME="/usr/lib/icecc/" + else + GCC_HOME="/opt/icecream/" + fi + else + GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,` + GCC_HOME_SET="false" + fi + else + GCC_HOME="$with_gcc_home" + fi + AC_MSG_RESULT($GCC_HOME) + AC_SUBST(GCC_HOME) + + if test "$GCC_HOME_SET" = "true"; then + if test -z "$CC"; then + CC="$GCC_HOME/bin/gcc" + fi + if test -z "$CXX"; then + CXX="$GCC_HOME/bin/g++" + fi + fi fi dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32) |