diff --git a/programming/build/gn/files/gn-bootstrap.patch b/programming/build/gn/files/gn-bootstrap.patch
new file mode 100644
index 0000000000..fb24e16369
--- /dev/null
+++ b/programming/build/gn/files/gn-bootstrap.patch
@@ -0,0 +1,15 @@
+--- a/build/gen.py.gn-bootstrap	2018-07-21 09:17:17.000000000 +0200
++++ b/build/gen.py	2018-07-21 17:08:45.465590164 +0200
+@@ -367,10 +367,8 @@
+         # Use the sid sysroot that UpdateLinuxSysroot() downloads.
+         cflags.append('--sysroot=' + linux_sysroot)
+         ldflags.append('--sysroot=' + linux_sysroot)
+-      ldflags.extend([
+-          '-static-libstdc++',
+-          '-Wl,--as-needed',
+-      ])
++        ldflags.append('-static-libstdc++')
++      ldflags.append('-Wl,--as-needed')
+       libs.extend([
+           # These are needed by libc++.
+           '-ldl',
diff --git a/programming/build/gn/pspec.xml b/programming/build/gn/pspec.xml
index b04c6b1382..920c15adb4 100644
--- a/programming/build/gn/pspec.xml
+++ b/programming/build/gn/pspec.xml
@@ -17,12 +17,10 @@
             <Dependency>git</Dependency>
             <Dependency>ninja</Dependency>
         </BuildDependencies>
-        <!--
         <Patches>
-            <Patch>gn.patch</Patch>
-            <Patch level="1">gn.patch</Patch>
+            <Patch>gn-bootstrap.patch</Patch>
+<!--             <Patch level="1">gn.patch</Patch> -->
         </Patches>
-        -->
     </Source>
 
     <Package>