diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-01-07 21:17:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-01-07 21:29:53 +0100 |
| commit | b71d2ba8785e9883f4f2d239c557c9034b6be876 (patch) | |
| tree | 52858686958c4c66c6c1f7a98ae63c3269eacb15 /gnu/packages/axoloti.scm | |
| parent | c5d670308cbd0a6ee67e04e58cb77fa40e8ad328 (diff) | |
| parent | 5f8a993aa85554ca09bd27139230d7664107e1b6 (diff) | |
Merge branch 'master' into core-updates
Change-Id: I150b4077fffca97c860439292a8d053579d64cb7
Diffstat (limited to 'gnu/packages/axoloti.scm')
| -rw-r--r-- | gnu/packages/axoloti.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 83e5056b16..b99dca0f2f 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -320,9 +320,9 @@ runtime.") (toolchain (assoc-ref inputs "cross-toolchain")) (includes (string-append toolchain - "/arm-none-eabi/include:" + "/arm-none-eabi/include/c++:" toolchain - "/arm-none-eabi/include/arm-none-eabi/armv7e-m"))) + "/arm-none-eabi/include/c++/arm-none-eabi/armv7e-m"))) (display (string-append "#!" (which "sh") "\n" "export CROSS_CPATH=" includes "\n" @@ -333,8 +333,7 @@ runtime.") " -Daxoloti_release=" runtime " -Daxoloti_runtime=" runtime " -jar " dir "/Axoloti.jar"))))) - (chmod target #o555)) - #t))) + (chmod target #o555))))) (add-after 'install 'strip-jar-timestamps (assoc-ref ant:%standard-phases 'strip-jar-timestamps))))) (inputs |