Skip to content

Commit e0540b2

Browse files
committed
Hopefully this will correct the build failure with GCC 15.x
1 parent af3edbf commit e0540b2

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

builder/esp32.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -478,20 +478,10 @@ def esp32_s3_args(extra_args):
478478
action='store_true'
479479
)
480480

481-
esp_argParser.add_argument(
482-
'--enable_fb_test',
483-
dest='optimum_fb_size',
484-
default=False,
485-
action='store_true'
486-
)
487-
488481
esp_args, extra_args = esp_argParser.parse_known_args(extra_args)
489482

490483
oct_flash = esp_args.oct_flash
491484
board_variant = esp_args.board_variant
492-
optimum_fb_size = str(int(esp_args.optimum_fb_size))
493-
494-
os.environ['EXTRA_CFLAGS'] = f'-DLCD_RGB_OPTIMUM_FB_SIZE={optimum_fb_size}'
495485

496486
return extra_args
497487

@@ -755,8 +745,6 @@ def environ_helper(idf_path):
755745

756746
spawn(env_cmds, out_to_screen=False)
757747

758-
env['EXTRA_CFLAGS'] = f'-DLCD_RGB_OPTIMUM_FB_SIZE={optimum_fb_size}'
759-
760748
return env
761749

762750

@@ -850,7 +838,6 @@ def setup_idf_environ():
850838
else:
851839
cmds = []
852840

853-
env['EXTRA_CFLAGS'] = f'-DLCD_RGB_OPTIMUM_FB_SIZE={optimum_fb_size}'
854841
return env, cmds
855842

856843

make.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,11 @@ def create_lvgl_header():
246246

247247

248248
if __name__ == '__main__':
249+
250+
if 'EXTRA_CFLAGS' not in os.environ:
251+
os.environ['EXTRA_CFLAGS'] = f'-Wno-unterminated-string-initialization'
252+
elif '-Wno-unterminated-string-initialization' not in os.environ['EXTRA_CFLAGS']:
253+
os.environ['EXTRA_CFLAGS'] += f' -Wno-unterminated-string-initialization'
249254

250255
from builder import set_mp_version
251256

0 commit comments

Comments
 (0)