~ruther/guix-local

06587003b896755f876ecd57b848e1d663fafb87 — Jean-Pierre De Jesus DIAZ 2 years ago 119edc3
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>
1 files changed, 10 insertions(+), 1 deletions(-)

M guix/build-system/meson.scm
M guix/build-system/meson.scm => guix/build-system/meson.scm +10 -1
@@ 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.