From ee088f3aea8135a5385c57ddfbc6c5df22843b92 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sun, 6 Mar 2016 00:40:28 +0200 Subject: [PATCH] Fix dumping data for IDE with excess -fPIC flag --- platformio/builder/tools/piomisc.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py index e080a2e0..85ed52b4 100644 --- a/platformio/builder/tools/piomisc.py +++ b/platformio/builder/tools/piomisc.py @@ -213,14 +213,15 @@ def DumpIDEData(env): ) return defines + LINTCCOM = "$CFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS" + LINTCXXCOM = "$CXXFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS" env_ = env.Clone() data = { "defines": get_defines(env_), "includes": get_includes(env_), - "cc_flags": env_.subst("$SHCFLAGS $SHCCFLAGS $CPPFLAGS $_CPPDEFFLAGS"), - "cxx_flags": env_.subst( - "$SHCXXFLAGS $SHCCFLAGS $CPPFLAGS $_CPPDEFFLAGS"), + "cc_flags": env_.subst(LINTCCOM), + "cxx_flags": env_.subst(LINTCXXCOM), "cxx_path": where_is_program( env_.subst("$CXX"), env_.subst("${ENV['PATH']}")) } @@ -238,9 +239,8 @@ def DumpIDEData(env): env_.Replace(CPPDEFINES=_new_defines) data.update({ - "cc_flags": env_.subst("$SHCFLAGS $SHCCFLAGS $CPPFLAGS $_CPPDEFFLAGS"), - "cxx_flags": env_.subst( - "$SHCXXFLAGS $SHCCFLAGS $CPPFLAGS $_CPPDEFFLAGS") + "cc_flags": env_.subst(LINTCCOM), + "cxx_flags": env_.subst(LINTCXXCOM) }) return data