[Libreoffice-commits] core.git: configure.ac

[Michael Stahl]

 configure.ac |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 40d38c2140ddd172433e68e3fa59bc184597ac15
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Fri Apr 20 14:13:19 2018 +0200

    configure: find icecream GCC wrappers on Fedora
    
    Change-Id: I7e5ad4e35c6d26b496f9c3a1eb24ee4f49ce57e9
    Reviewed-on: https://gerrit.libreoffice.org/53200
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/configure.ac b/configure.ac
index 5f14c5b99baa..6f9b2dc7fc90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2618,8 +2618,13 @@ if test "$_os" != "WINNT"; then
         if test "$enable_icecream" = "yes"; then
             if test -d "/usr/lib/icecc/bin"; then
                 GCC_HOME="/usr/lib/icecc/"
-            else
+            elif test -d "/usr/libexec/icecc/bin"; then
+                GCC_HOME="/usr/libexec/icecc/"
+            elif test -d "/opt/icecream/bin"; then
                 GCC_HOME="/opt/icecream/"
+            else
+                AC_MSG_ERROR([Could not figure out the location of icecream GCC wrappers, manually use --with-gcc-home])
+
             fi
         else
             GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`