Make: Prepend path to dependency info files with sed #778
Conversation
This file contains 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
|
@Kijewski what do you think? |
|
Added change to native as well (which duplicates this code to filter out riot/posix includes). |
| @@ -18,7 +18,8 @@ include $(RIOTBASE)/Makefile.base | |||
| $(BINDIR)%.o: %.c | |||
| $(AD)$(CC) $(CFLAGS) $(filter-out $(EXCLUDES),$(INCLUDES)) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -c $*.c -o $(BINDIR)$*.o | |||
| @$(CC) $(CFLAGS) $(INCLUDES) $(BOARDINCLUDE) $(PROJECTINCLUDE) $(CPUINCLUDE) -MM $*.c > $(BINDIR)$*.d | |||
| @printf "$(BINDIR)" | cat - $(BINDIR)$*.d > /tmp/riot_out && mv /tmp/riot_out $(BINDIR)$*.d | |||
| @# prepend path to dependency info file | |||
| $(AD)sed -i -e "1s|^|$(BINDIR)|" $(BINDIR)$*.d | |||
There was a problem hiding this comment.
Why don't you just pipe the line 20 through sed?
LudwigKnuepfer
added a commit
to LudwigKnuepfer/RIOT
that referenced
this pull request
Feb 26, 2014
addresses: RIOT-OS#778 (comment)
|
@haukepetersen could you test this with one board for each remaining family please? |
LudwigKnuepfer
added a commit
to LudwigKnuepfer/RIOT
that referenced
this pull request
Mar 3, 2014
addresses: RIOT-OS#778 (comment)
|
Rebased and updated because #804 was merged. |
LudwigKnuepfer
added a commit
to LudwigKnuepfer/RIOT
that referenced
this pull request
Mar 5, 2014
addresses: RIOT-OS#778 (comment)
|
rebased |
LudwigKnuepfer
added a commit
to LudwigKnuepfer/RIOT
that referenced
this pull request
Mar 10, 2014
addresses: RIOT-OS#778 (comment)
|
rebased Tested on native, msba2, chronos. I think it's ready to be merged. |
|
ACK. |
|
@OlegHahm Did you want to test this? |
The old way was error prone due to it's use of a fixed path file and confusing. closes RIOT-OS#775
addresses: RIOT-OS#778 (comment)
|
rebased, cleaned up a bit |
|
@OlegHahm ping |
|
ACK |
OlegHahm
added a commit
that referenced
this pull request
Apr 8, 2014
Make: Prepend path to dependency info files with sed
dangnhat
pushed a commit
to vanhieubk/RIOT
that referenced
this pull request
Apr 25, 2014
addresses: RIOT-OS#778 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The old way was error prone due to it's use of a fixed path file and confusing.
closes #775
buildtest passed - needs testing.
Tested on: