arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-04-15 23:05:45 +00:00
Code Issues Releases Wiki Activity

fix(core): fix emulator build on macOS

Browse Source 
[no changelog]
This commit is contained in:
cepetr 2025-04-01 09:06:10 +02:00 committed by cepetr
parent ad73e41080
commit 271f029be7
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/SConscript.bootloader_emu
View File

@ -258,9 +258,12 @@ rust = tools.add_rust_lib(
build_dir=str(Dir('.').abspath),
)
env.Append(LINKFLAGS=['-lm'])
env.Append(LINKFLAGS='-lm')
env.Append(LINKFLAGS='-Wl,' + ('-dead_strip' if env['PLATFORM'] == 'darwin' else '--gc-sections'))
if env['PLATFORM'] == 'darwin':
env.Append(LINKFLAGS=['-Wl,-dead_strip'])
else:
env.Append(LINKFLAGS=['-Wl,--gc-sections'])
#
# Program objects

2
core/embed/gfx/bitblt/gfx_bitblt_rgb565.c
View File

@ -19,7 +19,9 @@
// Turning off the stack protector for this file improves
// the performance of drawing operations when called frequently.
#ifndef TREZOR_EMULATOR
#pragma GCC optimize("no-stack-protector")
#endif
#include <gfx/gfx_bitblt.h>

12
core/embed/projects/bootloader/workflow/wf_bootloader.c
View File

@ -42,7 +42,7 @@ workflow_result_t workflow_bootloader(const vendor_header *const vhdr,
while (true) {
switch (screen) {
case SCREEN_INTRO:
case SCREEN_INTRO: {
intro_result_t ui_result = ui_screen_intro(vhdr, hdr, firmware_present);
if (ui_result == INTRO_MENU) {
screen = SCREEN_MENU;
@ -50,8 +50,8 @@ workflow_result_t workflow_bootloader(const vendor_header *const vhdr,
if (ui_result == INTRO_HOST) {
screen = SCREEN_WAIT_FOR_HOST;
}
break;
case SCREEN_MENU:
} break;
case SCREEN_MENU: {
menu_result_t menu_result = ui_screen_menu(firmware_present);
if (menu_result == MENU_EXIT) { // exit menu
screen = SCREEN_INTRO;
@ -78,8 +78,8 @@ workflow_result_t workflow_bootloader(const vendor_header *const vhdr,
}
return WF_ERROR_FATAL;
}
break;
case SCREEN_WAIT_FOR_HOST:
} break;
case SCREEN_WAIT_FOR_HOST: {
workflow_result_t res =
workflow_host_control(vhdr, hdr, ui_screen_connect);
switch (res) {
@ -89,7 +89,7 @@ workflow_result_t workflow_bootloader(const vendor_header *const vhdr,
default:
return res;
}
break;
} break;
default:
return WF_ERROR_FATAL;
break;

4
core/site_scons/tools.py
View File

@ -182,7 +182,7 @@ def add_rust_lib(*, env, build, profile, features, all_paths, build_dir):
action=cargo_build(),
)
env.Append(LINKFLAGS=f"-L{RUST_LIBDIR}")
env.Append(LINKFLAGS=f"-l{RUST_LIB}")
env.Append(LINKFLAGS=[f"-L{RUST_LIBDIR}"])
env.Append(LINKFLAGS=[f"-l{RUST_LIB}"])
return rust