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

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Mon Oct 12 08:10:43 PDT 2015


 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 845cc7aa383fcfc7ae564705fe93a95972bb1052
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Oct 12 17:04:30 2015 +0200

    configure: make emscripten read from stdin
    
    Emscripten doesn't support reading from stdin currently.
    This works around that bug by using the /dev/stdin file
    See https://github.com/kripken/emscripten/issues/3800
    
    Change-Id: I0c938504d645acdeae89c83e0f00bb856381f943

diff --git a/configure.ac b/configure.ac
index 758c9e8..41d080f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3263,8 +3263,8 @@ if test "$GCC" = "yes"; then
 
     if test "$COM_GCC_IS_CLANG" = TRUE; then
         AC_MSG_CHECKING([the Clang version])
-        clang_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | $CC -E -P -`
-        CLANG_FULL_VERSION=`echo __clang_version__ | $CC -E -P -`
+        clang_version=`echo __clang_major__.__clang_minor__.__clang_patchlevel__ | $CC -E -P /dev/stdin`
+        CLANG_FULL_VERSION=`echo __clang_version__ | $CC -E -P /dev/stdin`
         CLANGVER=`echo $clang_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
         AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
         AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)


More information about the Libreoffice-commits mailing list