From 6c2c4c15f31f195f2ba8eb5aac804c031397b9dc Mon Sep 17 00:00:00 2001 From: schneider <schneider@blinkenlichts.net> Date: Fri, 5 Jul 2019 21:42:56 +0200 Subject: [PATCH] fix(meson): Only use nano.specs for the cross build --- card10-cross.ini | 3 ++- meson.build | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/card10-cross.ini b/card10-cross.ini index d0a5d921..be7a3da4 100644 --- a/card10-cross.ini +++ b/card10-cross.ini @@ -5,7 +5,8 @@ strip = 'arm-none-eabi-strip' [properties] c_args = ['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wa,-mimplicit-it=thumb', '-ffunction-sections', '-fdata-sections', '-fsingle-precision-constant', '-fno-isolate-erroneous-paths-dereference', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group'] -c_link_args = ['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group'] + +c_link_args = ['-mthumb', '-mcpu=cortex-m4', '-mfloat-abi=hard', '-mfpu=fpv4-sp-d16', '-Wl,--start-group', '-lc', '-lnosys', '-Wl,--end-group', '--specs=nano.specs', '-u _printf_float'] target_defs = ['-DTARGET=32665', '-DTARGET_REV=0x4131', '-DBOARD_CARD10=1'] diff --git a/meson.build b/meson.build index 1ee97063..20b7040b 100644 --- a/meson.build +++ b/meson.build @@ -24,8 +24,6 @@ add_global_arguments( add_global_link_arguments( '-Wl,--gc-sections', '-lm', - '--specs=nano.specs', - '-u _printf_float', language: 'c', ) -- GitLab