PlatformIO: Fix linking to make initVariant() work (espressif#6809)

maxgerhardt · web-flow · commit 3e8f7fe8d474 · 2022-05-27T13:35:32.000+03:00
diff --git a/tools/platformio-build-esp32.py b/tools/platformio-build-esp32.py
@@ -356,10 +356,10 @@
             join(variants_dir, env.BoardConfig().get("build.variant"))
         ]
     )
-    libs.append(env.BuildLibrary(
+    env.BuildSources(
         join("$BUILD_DIR", "FrameworkArduinoVariant"),
         join(variants_dir, env.BoardConfig().get("build.variant"))
-    ))
+    )
 
 envsafe = env.Clone()
 
diff --git a/tools/platformio-build-esp32c3.py b/tools/platformio-build-esp32c3.py
@@ -349,10 +349,10 @@
             join(variants_dir, env.BoardConfig().get("build.variant"))
         ]
     )
-    libs.append(env.BuildLibrary(
+    env.BuildSources(
         join("$BUILD_DIR", "FrameworkArduinoVariant"),
         join(variants_dir, env.BoardConfig().get("build.variant"))
-    ))
+    )
 
 envsafe = env.Clone()
 
diff --git a/tools/platformio-build-esp32s2.py b/tools/platformio-build-esp32s2.py
@@ -351,10 +351,10 @@
             join(variants_dir, env.BoardConfig().get("build.variant"))
         ]
     )
-    libs.append(env.BuildLibrary(
+    env.BuildSources(
         join("$BUILD_DIR", "FrameworkArduinoVariant"),
         join(variants_dir, env.BoardConfig().get("build.variant"))
-    ))
+    )
 
 envsafe = env.Clone()
 
diff --git a/tools/platformio-build-esp32s3.py b/tools/platformio-build-esp32s3.py
@@ -368,10 +368,10 @@
             join(variants_dir, env.BoardConfig().get("build.variant"))
         ]
     )
-    libs.append(env.BuildLibrary(
+    env.BuildSources(
         join("$BUILD_DIR", "FrameworkArduinoVariant"),
         join(variants_dir, env.BoardConfig().get("build.variant"))
-    ))
+    )
 
 envsafe = env.Clone()
 

Original file line number	Diff line number	Diff line change
`@@ -356,10 +356,10 @@`
`356`	`356`	`join(variants_dir, env.BoardConfig().get("build.variant"))`
`357`	`357`	`]`
`358`	`358`	`)`
`359`		`- libs.append(env.BuildLibrary(`
	`359`	`+ env.BuildSources(`
`360`	`360`	`join("$BUILD_DIR", "FrameworkArduinoVariant"),`
`361`	`361`	`join(variants_dir, env.BoardConfig().get("build.variant"))`
`362`		`- ))`
	`362`	`+ )`
`363`	`363`
`364`	`364`	`envsafe = env.Clone()`
`365`	`365`
Original file line number	Diff line number	Diff line change
`@@ -349,10 +349,10 @@`
`349`	`349`	`join(variants_dir, env.BoardConfig().get("build.variant"))`
`350`	`350`	`]`
`351`	`351`	`)`
`352`		`- libs.append(env.BuildLibrary(`
	`352`	`+ env.BuildSources(`
`353`	`353`	`join("$BUILD_DIR", "FrameworkArduinoVariant"),`
`354`	`354`	`join(variants_dir, env.BoardConfig().get("build.variant"))`
`355`		`- ))`
	`355`	`+ )`
`356`	`356`
`357`	`357`	`envsafe = env.Clone()`
`358`	`358`
Original file line number	Diff line number	Diff line change
`@@ -351,10 +351,10 @@`
`351`	`351`	`join(variants_dir, env.BoardConfig().get("build.variant"))`
`352`	`352`	`]`
`353`	`353`	`)`
`354`		`- libs.append(env.BuildLibrary(`
	`354`	`+ env.BuildSources(`
`355`	`355`	`join("$BUILD_DIR", "FrameworkArduinoVariant"),`
`356`	`356`	`join(variants_dir, env.BoardConfig().get("build.variant"))`
`357`		`- ))`
	`357`	`+ )`
`358`	`358`
`359`	`359`	`envsafe = env.Clone()`
`360`	`360`
Original file line number	Diff line number	Diff line change
`@@ -368,10 +368,10 @@`
`368`	`368`	`join(variants_dir, env.BoardConfig().get("build.variant"))`
`369`	`369`	`]`
`370`	`370`	`)`
`371`		`- libs.append(env.BuildLibrary(`
	`371`	`+ env.BuildSources(`
`372`	`372`	`join("$BUILD_DIR", "FrameworkArduinoVariant"),`
`373`	`373`	`join(variants_dir, env.BoardConfig().get("build.variant"))`
`374`		`- ))`
	`374`	`+ )`
`375`	`375`
`376`	`376`	`envsafe = env.Clone()`
`377`	`377`