diff --git a/contrib/guix/manifest_build.scm b/contrib/guix/manifest_build.scm index 6646a0523fe..f151824ed23 100644 --- a/contrib/guix/manifest_build.scm +++ b/contrib/guix/manifest_build.scm @@ -165,14 +165,14 @@ chain for " target " development.")) (arguments (substitute-keyword-arguments (package-arguments base-gcc) ((#:configure-flags flags) - `(append ,flags + #~(append #$flags ;; https://gcc.gnu.org/install/configure.html - (list "--enable-threads=posix", - "--enable-default-ssp=yes", - "--enable-host-bind-now=yes", - "--disable-gcov", - "--disable-libgomp", - building-on))))))) + (list "--enable-threads=posix" + "--enable-default-ssp=yes" + "--enable-host-bind-now=yes" + "--disable-gcov" + "--disable-libgomp" + #$building-on))))))) (define-public linux-base-gcc (package @@ -180,22 +180,22 @@ chain for " target " development.")) (arguments (substitute-keyword-arguments (package-arguments base-gcc) ((#:configure-flags flags) - `(append ,flags + #~(append #$flags ;; https://gcc.gnu.org/install/configure.html - (list "--enable-initfini-array=yes", - "--enable-default-ssp=yes", - "--enable-default-pie=yes", - "--enable-host-bind-now=yes", - "--enable-standard-branch-protection=yes", - "--enable-cet=yes", - "--enable-gprofng=no", - "--disable-gcov", - "--disable-libgomp", - "--disable-libquadmath", - "--disable-libsanitizer", - building-on))) + (list "--enable-initfini-array=yes" + "--enable-default-ssp=yes" + "--enable-default-pie=yes" + "--enable-host-bind-now=yes" + "--enable-standard-branch-protection=yes" + "--enable-cet=yes" + "--enable-gprofng=no" + "--disable-gcov" + "--disable-libgomp" + "--disable-libquadmath" + "--disable-libsanitizer" + #$building-on))) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases ;; Given a XGCC package, return a modified package that replace each instance of ;; -rpath in the default system spec that's inserted by Guix with -rpath-link (add-after 'pre-configure 'replace-rpath-with-rpath-link