Skip to content

Commit

Permalink
Merge branch 'bugfix/embed_text_files' into 'master'
Browse files Browse the repository at this point in the history
build system: Fix null-terminating of text files for embedding on OS X

Ref github #112

`/bin/echo -ne` echoes literal `-ne` on OS X.


See merge request !238
  • Loading branch information
projectgus committed Nov 23, 2016
2 parents d0c9c1d + 5ac7810 commit 8693e80
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion make/component_wrapper.mk
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ embed_bin/$$(notdir $(1)): $(call resolvepath,$(1),$(COMPONENT_PATH)) | embed_bi

embed_txt/$$(notdir $(1)): $(call resolvepath,$(1),$(COMPONENT_PATH)) | embed_txt
cp $$< $$@
echo -ne '\0' >> $$@ # null-terminate text files
printf '\0' >> $$@ # null-terminate text files

# messing about with the embed_X subdirectory then using 'cd' for objcopy is because the
# full path passed to OBJCOPY makes it into the name of the symbols in the .o file
Expand Down

0 comments on commit 8693e80

Please sign in to comment.