From bf8f1e9efb68a249b8627aade256a450d11511e0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 7 Jul 2023 22:48:09 +0300 Subject: [PATCH] Remove redundant code --- platformio/builder/tools/piointegration.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/platformio/builder/tools/piointegration.py b/platformio/builder/tools/piointegration.py index 88368929..6f0a972e 100644 --- a/platformio/builder/tools/piointegration.py +++ b/platformio/builder/tools/piointegration.py @@ -14,7 +14,6 @@ import glob import os -import shlex import SCons.Defaults # pylint: disable=import-error import SCons.Subst # pylint: disable=import-error @@ -139,14 +138,9 @@ def dump_svd_path(env): return None -def _subst_cmd(env, cmd): - args = env.subst_list(cmd, SCons.Subst.SUBST_CMD)[0] - return " ".join([SCons.Subst.quote_spaces(arg) for arg in args]) - - -def _split_flags_string(s): - flags = shlex.split(s, posix=False) - return [f[1:-1] if f.startswith('"') and f.endswith('"') else f for f in flags] +def _split_flags_string(env, s): + args = env.subst_list(s, SCons.Subst.SUBST_CMD)[0] + return [str(arg) for arg in args] def DumpIntegrationData(*args): @@ -159,12 +153,8 @@ def DumpIntegrationData(*args): ], "defines": dump_defines(projenv), "includes": projenv.DumpIntegrationIncludes(), - "cc_flags": _split_flags_string( - _subst_cmd(projenv, "$CFLAGS $CCFLAGS $CPPFLAGS") - ), - "cxx_flags": _split_flags_string( - _subst_cmd(projenv, "$CXXFLAGS $CCFLAGS $CPPFLAGS") - ), + "cc_flags": _split_flags_string(projenv, "$CFLAGS $CCFLAGS $CPPFLAGS"), + "cxx_flags": _split_flags_string(projenv, "$CXXFLAGS $CCFLAGS $CPPFLAGS"), "cc_path": where_is_program( globalenv.subst("$CC"), globalenv.subst("${ENV['PATH']}") ),