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.

diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in
index 7bfe3fe60034a9f77e954c90d2751a0b20497f74..017a562e71c494fd3f8c0ab0f1a7c3b7f95222e1 100644 (file)
--- 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 2ecac1b29d8c3036f128b942fdacecd4d2ce2063..d5435451bff0141f1a4a040d7fa3e55f0c488ad4 100644 (file)
--- 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 ec8ececc48e37589f2b350e8bb78d74ec539b5c7..4ba658e4e022030b2eac10fa3d52097d973a7957 100644 (file)
--- 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)