From 479bf10878d9d33012f57be72d96e30ac2b51f89 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 6 Jul 2019 13:57:30 +0200
Subject: [PATCH] build: Handle gcc with --pie-by-default.

This fixes upgrading to debian-hurd-20190220.img.

* build-aux/build.sh.in (CFLAGS): Add -static.  Fixes using gcc
compiled with --pie-by-default
* build-aux/check.sh.in (CFLAGS): Likewise.
* module/mescc.scm (parse-opts): Ignore -no-pie, -static.
---
 build-aux/build.sh.in | 1 +
 build-aux/check.sh.in | 1 +
 module/mescc.scm      | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in
index 7bfe3fe6..017a562e 100644
--- a/build-aux/build.sh.in
+++ b/build-aux/build.sh.in
@@ -52,6 +52,7 @@ debug=
 #debug=-g
 
 CFLAGS="
+-static
 $debug
 "
 
diff --git a/build-aux/check.sh.in b/build-aux/check.sh.in
index 2ecac1b2..d5435451 100644
--- a/build-aux/check.sh.in
+++ b/build-aux/check.sh.in
@@ -30,6 +30,7 @@ fi
 CFLAGS=
 if test $mes_libc = mes; then
     CFLAGS="
+-static
 -nostdinc
 -nostdlib
 -fno-builtin
diff --git a/module/mescc.scm b/module/mescc.scm
index ec8ececc..4ba658e4 100644
--- a/module/mescc.scm
+++ b/module/mescc.scm
@@ -73,6 +73,7 @@
             (nostdinc)
             (nostdlib)
             (preprocess (single-char #\E))
+            (static)
             (std (value #t))
             (output (single-char #\o) (value #t))
             (optimize (single-char #\O) (value #t))
@@ -117,7 +118,9 @@ Usage: mescc [OPTION]... FILE...
 
 Ignored for GCC compatibility
   -fno-builtin
+  -no-pie
   -nostdinc
+  -static
 
 Environment variables:
 
@@ -135,10 +138,12 @@ General help using GNU software: <http://gnu.org/gethelp/>
 (define (mescc:main args)
   (let* ((single-dash-options '("-dumpmachine"
                                 "-fno-builtin"
+                                "-no-pie"
                                 "-nodefaultlibs"
                                 "-nostartfiles"
                                 "-nostdinc"
                                 "-nostdlib"
+                                "-static"
                                 "-std"))
          (args (map (lambda (o)
                       (if (member o single-dash-options) (string-append "-" o)