summaryrefslogtreecommitdiff
path: root/debian/rules.defs
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2015-03-08 18:40:30 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2015-03-08 18:40:30 +0000
commiteafe59c021102bf4b130b3798e3d332ae404f131 (patch)
treeb49415dfa79c9a3f477b8cfbc4bc2e5151c6bb3f /debian/rules.defs
parent6dcf08a29044709b79de71649d43551ffb5cd271 (diff)
downloadgcc-5-eafe59c021102bf4b130b3798e3d332ae404f131.tar.gz
* libgo: Add arm64 to the pointer size map (Michael Hudson).
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7877 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.defs')
-rw-r--r--debian/rules.defs5
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/rules.defs b/debian/rules.defs
index c4d59de..aa6bbc7 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -673,6 +673,10 @@ ifeq ($(java_no_cross)-$(DEB_CROSS),yes-yes)
endif
with_java := $(call envfilt, java, , c++, $(with_java))
+ifneq (,$(findstring gccgo, $(PKGSOURCE)))
+ with_java :=
+endif
+
ifeq ($(with_java)-$(with_separate_libgcj),yes-yes)
ifneq (,$(findstring gcj, $(PKGSOURCE)))
languages := c c++
@@ -756,7 +760,6 @@ go_no_cross := no
ifneq (,$(findstring gccgo, $(PKGSOURCE)))
with_separate_libgo := yes
with_standalone_go := yes
- with_java :=
endif
go_no_cpus := avr arm hppa m68k sh4 sparc sparc64