diff options
| author | Ricardo Wurmus <[email protected]> | 2025-03-04 19:53:10 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <[email protected]> | 2025-03-04 20:59:26 +0100 |
| commit | ce51a418287e780ea9b2aafa89490b45e9f76fca (patch) | |
| tree | 83d2144950eed692466e8baea370d7b1eaa0689f /gnu/packages/axoloti.scm | |
| parent | 1bdf8a450f3163fb1b73d78d3cb9aeeaf4780cdc (diff) | |
gnu: ksoloti-patcher: Fix cross compiler variables.
This is a follow-up to commit 90f3f4099093a81899b2d5da9715df7935c42246.
* gnu/packages/axoloti.scm (ksoloti-patcher)[arguments]: Update environment
variables in Ksoloti executable.
Change-Id: Ie7fafc1e520645f9264e1346ff38b9865b5109a0
Diffstat (limited to 'gnu/packages/axoloti.scm')
| -rw-r--r-- | gnu/packages/axoloti.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index d446b1a1c4..3dfd82c09f 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -858,18 +858,19 @@ This package provides the runtime.") (runtime (search-input-directory inputs "share/ksoloti")) (toolchain (assoc-ref inputs "cross-toolchain")) + (libstdc++ (assoc-ref inputs "libstdc++")) (includes (string-append toolchain - "/arm-none-eabi/include/:" - toolchain "/arm-none-eabi/include/c++:" + libstdc++ + "/arm-none-eabi/include/c++/arm-none-eabi/thumb/v7-m/nofp:" toolchain - "/arm-none-eabi/include/c++/arm-none-eabi/armv7e-m")) + "/arm-none-eabi/include/")) (marlin.jar (search-input-file inputs "/share/java/marlin.jar"))) (display (string-append "#!" (which "sh") "\n" - "export CROSS_CPATH=" includes "\n" + "export PATH=" toolchain "/bin:$PATH\n" "export CROSS_CPLUS_INCLUDE_PATH=" includes "\n" "export CROSS_LIBRARY_PATH=" toolchain "/arm-none-eabi/lib" "\n" |