From d57cc7b1561183abdc3e8e996967d53806ecbf8e Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 3 Feb 2015 13:50:08 +0200
Subject: [PATCH] Keep Scons env state between SConscripts

---
 platformio/builder/scripts/frameworks/arduino.py | 2 +-
 platformio/builder/scripts/frameworks/energia.py | 2 +-
 platformio/builder/tools/platformio.py           | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index ca7409eb..34e12edd 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -56,4 +56,4 @@ libs.append(env.BuildLibrary(
     join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
 ))
 
-Return("libs")
+Return("env libs")
diff --git a/platformio/builder/scripts/frameworks/energia.py b/platformio/builder/scripts/frameworks/energia.py
index 45db6e7d..b1644e85 100644
--- a/platformio/builder/scripts/frameworks/energia.py
+++ b/platformio/builder/scripts/frameworks/energia.py
@@ -54,4 +54,4 @@ libs.append(env.BuildLibrary(
     join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
 ))
 
-Return("libs")
+Return("env libs")
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index f5766a15..7f6ceb08 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -24,10 +24,11 @@ def ProcessGeneral(env):
             env.ConvertInoToCpp()
         for f in env['FRAMEWORK'].split(","):
             SConscriptChdir(0)
-            corelibs = SConscript(
+            env, libs = SConscript(
                 env.subst(join("$PIOBUILDER_DIR", "scripts",
                                "frameworks", "%s.py" % f.strip().lower())),
                 exports="env")
+            corelibs += libs
     return corelibs