Respect linking order of libraries#8263
Merged
earlephilhower merged 4 commits intoesp8266:masterfrom Sep 1, 2021
Merged
Conversation
Now has the same order as the Arduino IDE does with its platform.txt
Instead of injecting at magic indices, which might break when some other extra-scripts inject other libraries, let's create the LIBS array at the bottom in easy to understand and correct order.
Collaborator
|
Initial LIBS could be left empty: if EXCEPTIONS:
CXX_LIBS = ["std++"]
else:
CXX_LIBS = ["std++-noexc"]
SDK_LIBS = [
"hal", "phy", "pp", "net80211", "wpa", "crypto", "main",
"wps", "bearssl", "espnow", "smartconfig", "airkiss", "wpa2"
]
C_LIBS = [
"m", "c", "gcc"
]
if BLAH:
LWIP_LIBS = [ ... ]
# ...
env.Replace(LIBS=SDK_LIBS + LWIP_LIBS + CXX_LIBS + C_LIBS)? Hardcoded offsets are hard to parse at a glance |
Contributor
Author
|
I'm not quite sure if I follow? The hardcoded offsets have been removed with the latest commit because I didn't like that style either. The code at the bottom with |
Collaborator
|
Github interface caching is weird, looking at the |
Contributor
Author
|
I think this is a straight-forward fix & improvement PR. Any thoughts on getting this merged? |
Collaborator
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #8262.
Arduino IDE link order:
PlatformIO link order before this fix:
(^ which causes the linking failure in regards to the math library in the referenced issue)
PlatformIO link order after this fix:
Aka, now equivalent to the Arduino IDE linking order.
The code refactors setting
env["LIBS"]further down the script where it knows the system libraries to be built, and then creates the array with the correct linking order.The previous
env.Append(LIBS = ...)is wrong here because it appends to the back and hence does not respect the original linker order laid out in theplatform.txtArduino/platform.txt
Line 70 in 5f04fbb