Don't pass the -dynamic-linker flag to ld when linking statically.

Fixes creation of static binaries with base gcc and ld.lld.
OK kettenis@ a while ago, prodded by daniel@

11 files changed, 11 insertions, 11 deletions

diff --git a/gnu/gcc/gcc/config/alpha/openbsd.h b/gnu/gcc/gcc/config/alpha/openbsd.h
index 287779fb058..6848755c6dc 100644
--- a/gnu/gcc/gcc/config/alpha/openbsd.h
+++ b/gnu/gcc/gcc/config/alpha/openbsd.h
@@ -33,7 +33,7 @@ Boston, MA 02110-1301, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
 
 /* As an elf system, we need crtbegin/crtend stuff.  */
 #undef STARTFILE_SPEC
diff --git a/gnu/gcc/gcc/config/arm/openbsd.h b/gnu/gcc/gcc/config/arm/openbsd.h
index de10943479f..b148a64e1c2 100644
--- a/gnu/gcc/gcc/config/arm/openbsd.h
+++ b/gnu/gcc/gcc/config/arm/openbsd.h
@@ -76,7 +76,7 @@ Boston, MA 02111-1307, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
    %{!nostdlib:-L/usr/lib}"
 #endif
 
diff --git a/gnu/gcc/gcc/config/i386/openbsd64.h b/gnu/gcc/gcc/config/i386/openbsd64.h
index ddef4c13ebf..a40df92f6a7 100644
--- a/gnu/gcc/gcc/config/i386/openbsd64.h
+++ b/gnu/gcc/gcc/config/i386/openbsd64.h
@@ -121,7 +121,7 @@ Boston, MA 02111-1307, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
    %{!nostdlib:-L/usr/lib}"
 
 #define OBSD_HAS_CORRECT_SPECS
diff --git a/gnu/gcc/gcc/config/i386/openbsdelf.h b/gnu/gcc/gcc/config/i386/openbsdelf.h
index 0a475954be6..56a6eb8cb8b 100644
--- a/gnu/gcc/gcc/config/i386/openbsdelf.h
+++ b/gnu/gcc/gcc/config/i386/openbsdelf.h
@@ -126,7 +126,7 @@ Boston, MA 02110-1301, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
    %{!nostdlib:-L/usr/lib}"
 
 #define OBSD_HAS_CORRECT_SPECS
diff --git a/gnu/gcc/gcc/config/m88k/openbsdelf.h b/gnu/gcc/gcc/config/m88k/openbsdelf.h
index 267f8349f36..9748472eab4 100644
--- a/gnu/gcc/gcc/config/m88k/openbsdelf.h
+++ b/gnu/gcc/gcc/config/m88k/openbsdelf.h
@@ -122,7 +122,7 @@ __dcache_sync (addr, len)						\
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
 
 /* As an elf system, we need crtbegin/crtend stuff.  */
 #undef STARTFILE_SPEC
diff --git a/gnu/gcc/gcc/config/mips/openbsd.h b/gnu/gcc/gcc/config/mips/openbsd.h
index 5109cc99e12..9ec6b94a2cd 100644
--- a/gnu/gcc/gcc/config/mips/openbsd.h
+++ b/gnu/gcc/gcc/config/mips/openbsd.h
@@ -132,7 +132,7 @@ Boston, MA 02110-1301, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
 
 /* As an elf system, we need crtbegin/crtend stuff.  */
 #undef STARTFILE_SPEC
diff --git a/gnu/gcc/gcc/config/pa/openbsd.h b/gnu/gcc/gcc/config/pa/openbsd.h
index 1658138f86b..8a2da8ccbff 100644
--- a/gnu/gcc/gcc/config/pa/openbsd.h
+++ b/gnu/gcc/gcc/config/pa/openbsd.h
@@ -161,7 +161,7 @@ Boston, MA 02111-1307, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
 
 /* Layout of source language data types. */
 
diff --git a/gnu/gcc/gcc/config/pa/openbsd64.h b/gnu/gcc/gcc/config/pa/openbsd64.h
index 473eb0c0e83..5e95f08d7fc 100644
--- a/gnu/gcc/gcc/config/pa/openbsd64.h
+++ b/gnu/gcc/gcc/config/pa/openbsd64.h
@@ -149,7 +149,7 @@ Boston, MA 02111-1307, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
 
 /* Layout of source language data types. */
 
diff --git a/gnu/gcc/gcc/config/sh/openbsd.h b/gnu/gcc/gcc/config/sh/openbsd.h
index 59dd3ded5a1..6536bd5e1e2 100644
--- a/gnu/gcc/gcc/config/sh/openbsd.h
+++ b/gnu/gcc/gcc/config/sh/openbsd.h
@@ -80,7 +80,7 @@ Boston, MA 02110-1301, USA.  */
    %{static:-Bstatic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
 #endif
 
 
diff --git a/gnu/gcc/gcc/config/sparc/openbsd.h b/gnu/gcc/gcc/config/sparc/openbsd.h
index 907928aa5f0..0cca7852d34 100644
--- a/gnu/gcc/gcc/config/sparc/openbsd.h
+++ b/gnu/gcc/gcc/config/sparc/openbsd.h
@@ -83,7 +83,7 @@ Boston, MA 02110-1301, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
 
 /* As an elf system, we need crtbegin/crtend stuff.  */
 #undef STARTFILE_SPEC
diff --git a/gnu/gcc/gcc/config/sparc/openbsd64.h b/gnu/gcc/gcc/config/sparc/openbsd64.h
index 6a69aa435f2..e99ae98f31a 100644
--- a/gnu/gcc/gcc/config/sparc/openbsd64.h
+++ b/gnu/gcc/gcc/config/sparc/openbsd64.h
@@ -90,7 +90,7 @@ Boston, MA 02110-1301, USA.  */
    %{!static:-Bdynamic} \
    %{rdynamic:-export-dynamic} \
    %{assert*} \
-   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}"
+   %{!static:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
 
 /* As an elf system, we need crtbegin/crtend stuff.  */
 #undef STARTFILE_SPEC