[X2Go-Commits] [pale-moon] 17/52: debian/rules: move GCC selection around a bit.

git-admin at x2go.org git-admin at x2go.org
Fri Sep 21 23:08:29 CEST 2018


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

x2go pushed a commit to branch master
in repository pale-moon.

commit 8688c0822e6a7b3376bb37996e538f46b24cd4db
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Sep 20 21:53:58 2018 +0200

    debian/rules: move GCC selection around a bit.
---
 debian/changelog |  1 +
 debian/rules     | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45801fb..c896f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
       /usr/lib/palemoon/palemoon) still necessary, so uncomment.
     - Remove previous hack completely, already handled through
       debian/noinstall.
+    - Move GCC selection around a bit.
   * debian/mozconfig:
     - Remove autoconf flags that should better be handled by debian/rules.
   * debian/make.mk:
diff --git a/debian/rules b/debian/rules
index 6e5d470..bbf64c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,22 @@ $(call lazy,DEB_BUILD_ARCH_ENDIAN,$$(shell dpkg-architecture -qDEB_BUILD_ARCH_EN
 
 export SHELL=/bin/bash
 
+# Build with gcc-6 on Buster, Sid, Artful, Bionic and Cosmic.
+ifeq ($(DIST),$(filter buster sid artful bionic cosmic,$(DIST)))
+export CC=gcc-6
+export CXX=g++-6
+export CPP=cpp-6
+export LD=gcc-6
+# Build with gcc-4.9 on Jessie, Xenial and Horizon.
+else ifeq ($(DIST),$(filter jessie xenial Horizon,$(DIST)))
+export CC=gcc-4.9
+export CXX=g++-4.9
+export CPP=cpp-4.9
+export LD=gcc-4.9
+else
+# Use the system default.
+endif
+
 OFFICIAL_BRANDING := browser/branding/official
 MOZILLA_OFFICIAL := 1
 BRANDING ?= $(OFFICIAL_BRANDING)
@@ -38,22 +54,6 @@ LDFLAGS += -Wl,--no-keep-memory
 # Also add execution time and memory usage stats in the logs
 LDFLAGS += -Wl,--stats
 
-# Build with gcc-6 on Buster, Sid, Artful, Bionic and Cosmic.
-ifeq ($(DIST),$(filter buster sid artful bionic cosmic,$(DIST)))
-export CC=gcc-6
-export CXX=g++-6
-export CPP=cpp-6
-export LD=gcc-6
-# Build with gcc-4.9 on Jessie, Xenial and Horizon.
-else ifeq ($(DIST),$(filter jessie xenial Horizon,$(DIST)))
-export CC=gcc-4.9
-export CXX=g++-4.9
-export CPP=cpp-4.9
-export LD=gcc-4.9
-else
-# Use the system default.
-endif
-
 AUTOCONF_DIRS := build/autoconf js/src/build/autoconf
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git


More information about the x2go-commits mailing list