Repository for LD scripts; common LD script for ESP8266 // Resolve #379

platformio/__init__.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (2, 6, "1.dev0")
+VERSION = (2, 6, "1.dev1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

platformio/builder/main.py

@@ -114,6 +114,7 @@ DefaultEnvironment(
 )
 
 env = DefaultEnvironment()
+env.Prepend(LIBPATH=[join("$PIOPACKAGES_DIR", "ldscripts")])
 
 if "BOARD" in env:
     try:

platformio/builder/tools/platformio.py

@@ -78,7 +78,9 @@ def BuildProgram(env):
 
     env.Append(
         CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
-            *pioversion_to_intstr())]
+            *pioversion_to_intstr())],
+        LIBS=deplibs,
+        LIBPATH=["$BUILD_DIR"]
     )
 
     return env.Program(
@@ -86,9 +88,7 @@ def BuildProgram(env):
         env.LookupSources(
             "$BUILDSRC_DIR", "$PROJECTSRC_DIR", duplicate=False,
             src_filter=getenv("PLATFORMIO_SRC_FILTER",
-                              env.get("SRC_FILTER"))),
-        LIBS=env.get("LIBS", []) + deplibs,
-        LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"]
+                              env.get("SRC_FILTER")))
     )