[libreoffice] 11/11: use -dumpmachine; and probably we want gcj and not gcc here

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 8ccd1fff685183e347b3081a87cde74ad2c3ccde
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 15 22:24:32 2016 +0100

    use -dumpmachine; and probably we want gcj and not gcc here
---
 rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules b/rules
index 42d2c22..0cd9931 100755
--- a/rules
+++ b/rules
@@ -38,7 +38,7 @@ export gb_SHELL:=$(SHELL)
 #SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
 #FIXME
 SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\../\1/p' | cut -d" " -f1)
-SYSTEM_GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-// | sed -e s/$(shell gcc -v 2>&1 | grep Target | awk '{ print $$2 }')-//)
+SYSTEM_GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-// | sed -e s/$(shell gcj -dumpmachine)-//)
 
 PKGDIR:=debian/libreoffice
 OODIRNAME=libreoffice

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git