[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/gbuild

2014-11-10 Thread Luboš Luňák 
 configure.ac   |4 
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 71a9c492b8ac7d9f33a92327d43efcb0e4617243
Author: Luboš Luňák l.lu...@collabora.com
Date:   Mon Nov 10 12:29:10 2014 +0100

force --std=gnu89 for clang (and gcc), properly

This implements 3a4860a751980b566b44d57cde188292df5e8726 in the proper 
place.

Change-Id: I7b60602933819561d0bff5e72dcd5ee8986f63c0

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 1b2ceeb..b6d9735 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -107,6 +107,10 @@ gb_CXX03FLAGS := -std=gnu++98 -pedantic-errors 
-Wno-long-long \
 -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations
 endif
 
+# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to
+# to catch potential gnu89/C90 incompatibilities locally.
+gb_CFLAGS_COMMON += -std=gnu89
+
 ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto
commit 74a2fb369c9ca7b3b423723926626fb0760abb29
Author: Luboš Luňák l.lu...@collabora.com
Date:   Mon Nov 10 12:22:01 2014 +0100

Revert Force --std=gnu89 for clang.

Explictly passing any CFLAGS to configure overrides (=disables) CFLAGS that
would be used by default. So if this sets CFLAGS to just --std=gnu89, .c 
files
will never be built with optimization or debuginfo.

This reverts commit 3a4860a751980b566b44d57cde188292df5e8726.

diff --git a/configure.ac b/configure.ac
index b1fada1..f47b06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3190,10 +3190,6 @@ if test $GCC = yes; then
 AC_MSG_RESULT([Clang $CLANG_FULL_VERSION, $CLANGVER])
 AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
-
-# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to
-# to catch potential gnu89/C90 incompatibilities locally.
-CFLAGS=$CFLAGS -std=gnu89
 fi
 AC_SUBST(COM_GCC_IS_CLANG)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/gbuild

2013-09-24 Thread Matúš Kukan 
 configure.ac |3 ---
 solenv/gbuild/Package.mk |2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit dbea75feea1622cbe746486e0faa9308874dc88e
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Sep 18 14:26:17 2013 +0200

make dependency on directory order-only

Change-Id: I800a7c1ea7ae48252a22ab1dc848fdc5e6f6b3b9

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 595ad85..ed0f3ba 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -136,7 +136,7 @@ define gb_Package_add_symbolic_link
 $(call gb_Package__check,$(1))
 $(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_symbolic_link 
requires 3 arguments))
 $(call gb_Package_get_target,$(1)) : $$(gb_Package_OUTDIR_$(1))/$(2)
-$$(gb_Package_OUTDIR_$(1))/$(2) : $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir
+$$(gb_Package_OUTDIR_$(1))/$(2) :| $$(dir $$(gb_Package_OUTDIR_$(1))/$(2)).dir
rm -f $$@  ln -s $(3) $$@
 
 $(call gb_Package_get_target,$(1)) : FILES += $$(gb_Package_OUTDIR_$(1))/$(2)
commit 6a66cfe6aab8298cf5bc7c1a870bafcee9dd2146
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Wed Sep 18 09:22:28 2013 +0200

remove unused EXEEXT_FOR_BUILD

Change-Id: I6ac851e3ba418bb681f69f5417c74688776498be

diff --git a/configure.ac b/configure.ac
index 0bcbfae..880732e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,11 +164,9 @@ BUILDDIR=`pwd`
 cd $srcdir
 SRC_ROOT=`pwd`
 cd $BUILDDIR
-EXEEXT_FOR_BUILD=
 x_Cygwin=[\#]
 
 if test $build_os = cygwin; then
-EXEEXT_FOR_BUILD=.exe
 PathFormat $SRC_ROOT
 SRC_ROOT=$formatted_path
 PathFormat $BUILDDIR
@@ -178,7 +176,6 @@ fi
 
 AC_SUBST(SRC_ROOT)
 AC_SUBST(BUILDDIR)
-AC_SUBST(EXEEXT_FOR_BUILD)
 AC_SUBST(x_Cygwin)
 AC_DEFINE_UNQUOTED(SRCDIR,$SRC_ROOT)
 AC_DEFINE_UNQUOTED(BUILDDIR,$BUILDDIR)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits