Skip to content
This repository has been archived by the owner on Feb 15, 2025. It is now read-only.

Commit

Permalink
Use @dirname@ in Metrowerks cross files to point to linker script
Browse files Browse the repository at this point in the history
  • Loading branch information
Nomura-RH authored and eli-schwartz committed Sep 14, 2023
1 parent 0af126f commit 22da2c3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 18 deletions.
13 changes: 4 additions & 9 deletions cross/metrowerks-arm.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
# toolchain is added to the environment(PATH) variable, so that
# Meson can find the binaries while building.

# You should also do one of the following to ensure Meson can
# locate the .lcf linker script:
# - Add the cross directory to PATH as well
# - Edit c_link_args and cpp_link_args with the full
# path to the .lcf file on your machine

[binaries]
c = 'mwccarm'
c_ld = 'mwldarm'
Expand All @@ -18,11 +12,12 @@ as = 'mwasmarm'

[built-in options]
c_args = ['-lang', 'c99', '-D_NITRO', '-nosyspath']
c_link_args = 'metrowerks.lcf'
c_link_args = '@DIRNAME@' / 'metrowerks.lcf'
cpp_args = ['-lang', 'c++', '-D_NITRO', '-nosyspath']
cpp_link_args = 'metrowerks.lcf'
cpp_link_args = '@DIRNAME@' / 'metrowerks.lcf'

[host_machine]
system = 'bare metal'
cpu = 'arm'
cpu_family = 'arm'
endian = 'little'
endian = 'little'
13 changes: 4 additions & 9 deletions cross/metrowerks-eppc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
# of choice is added to the environment(PATH) variable, so that
# Meson can find the binaries while building.

# You should also do one of the following to ensure Meson can
# locate the .lcf linker script:
# - Add the cross directory to PATH as well
# - Edit c_link_args and cpp_link_args with the full
# path to the lcf file on your machine

[binaries]
c = 'mwcceppc'
c_ld = 'mwldeppc'
Expand All @@ -18,11 +12,12 @@ as = 'mwasmeppc'

[built-in options]
c_args = ['-lang', 'c99', '-nosyspath']
c_link_args = 'metrowerks.lcf'
c_link_args = '@DIRNAME@' / 'metrowerks.lcf'
cpp_args = ['-lang', 'c++', '-nosyspath']
cpp_link_args = 'metrowerks.lcf'
cpp_link_args = '@DIRNAME@' / 'metrowerks.lcf'

[host_machine]
system = 'bare metal'
cpu = 'ppc'
cpu_family = 'ppc'
endian = 'little'
endian = 'little'

0 comments on commit 22da2c3

Please sign in to comment.