[libreoffice] 01/02: fix gcc 4.9 setting
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.3
in repository libreoffice.
commit 1e01f1e06f6383333213f1193040968732e341aa
Author: Rene Engelhard <rene@debian.org>
Date: Sun May 11 18:40:45 2014 +0200
fix gcc 4.9 setting
---
rules | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/rules b/rules
index 2ca5b21..dd7104e 100755
--- a/rules
+++ b/rules
@@ -618,8 +618,10 @@ CC_PREFIX:=$(shell gcc -dumpmachine)-
# endif
# endif
#endif
-ifeq "$(JDK)" "gcj-jdk"
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
+ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_OPENJDK_ARCHS)))
GCC_VERSION := $(SYSTEM_GCJ_VERSION)
+ endif
endif
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: