guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

15/23: guix: meson-build-system: Disable PIC for AVR.


From: guix-commits
Subject: 15/23: guix: meson-build-system: Disable PIC for AVR.
Date: Mon, 11 Dec 2023 06:57:42 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 06587003b896755f876ecd57b848e1d663fafb87
Author: Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com>
AuthorDate: Tue Nov 28 12:34:58 2023 +0100

    guix: meson-build-system: Disable PIC for AVR.
    
    * guix/build-system/meson.scm (make-built-in-options-alist): New procedure.
    (make-cross-file): Add 'built-in options' section to cross file.
    
    Change-Id: Ifff7f6fb1eb8b0e8ddd04881d22acb863c9e85b2
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 guix/build-system/meson.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index dd5e9e897e..bf9ca15ecc 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -92,6 +92,13 @@ TRIPLET."
     (ld . ,(string-append triplet "-ld"))
     (strip . ,(string-append triplet "-strip"))))
 
+(define (make-built-in-options-alist triplet)
+  (if (target-avr? triplet)
+      `((b_pie . #f)
+        (b_staticpic . #f)
+        (default_library . "static"))
+       '()))
+
 (define (make-cross-file triplet)
   (computed-file "cross-file"
     (with-imported-modules '((guix build meson-configuration))
@@ -102,7 +109,9 @@ TRIPLET."
               (write-section-header port "host_machine")
               (write-assignments port '#$(make-machine-alist triplet))
               (write-section-header port "binaries")
-              (write-assignments port '#$(make-binaries-alist triplet))))))))
+              (write-assignments port '#$(make-binaries-alist triplet))
+              (write-section-header port "built-in options")
+              (write-assignments port '#$(make-built-in-options-alist 
triplet))))))))
 
 (define %meson-build-system-modules
   ;; Build-side modules imported by default.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]