diff options
| author | Nomura <nomura.rh@gmail.com> | 2023-09-13 20:40:08 +0200 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-09-13 22:10:59 -0400 |
| commit | 22da2c3c2df035220ea01e368120549987fa43ea (patch) | |
| tree | 4cd272ddc4443df03232ff09a07849cbe3c77f71 /cross | |
| parent | 0af126fec798d6dbb0d1ad52168cc1f3f1758acd (diff) | |
| download | meson-22da2c3c2df035220ea01e368120549987fa43ea.zip meson-22da2c3c2df035220ea01e368120549987fa43ea.tar.gz meson-22da2c3c2df035220ea01e368120549987fa43ea.tar.bz2 | |
Use @DIRNAME@ in Metrowerks cross files to point to linker script
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/metrowerks-arm.txt | 13 | ||||
| -rw-r--r-- | cross/metrowerks-eppc.txt | 13 |
2 files changed, 8 insertions, 18 deletions
diff --git a/cross/metrowerks-arm.txt b/cross/metrowerks-arm.txt index a13175b..a98643e 100644 --- a/cross/metrowerks-arm.txt +++ b/cross/metrowerks-arm.txt @@ -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' @@ -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'
\ No newline at end of file +endian = 'little' diff --git a/cross/metrowerks-eppc.txt b/cross/metrowerks-eppc.txt index e5e0e42..63a4543 100644 --- a/cross/metrowerks-eppc.txt +++ b/cross/metrowerks-eppc.txt @@ -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' @@ -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'
\ No newline at end of file +endian = 'little' |