Skip to content

Commit 47e7b2d

Browse files
authored
emulation on host: various minor fixes (#7741)
* emulation on host: makefile minor fixes * fix including debug.cpp, fix ranlib log
1 parent 594831d commit 47e7b2d

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

cores/esp8266/debug.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "Arduino.h"
2222
#include "debug.h"
23+
#include "osapi.h"
2324

2425
void ICACHE_RAM_ATTR hexdump(const void *mem, uint32_t len, uint8_t cols) {
2526
const uint8_t* src = (const uint8_t*) mem;

tests/host/Makefile

+9-3
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,20 @@ VERBC = @echo "C $@";
6262
VERBCXX = @echo "C++ $@";
6363
VERBLD = @echo "LD $@";
6464
VERBAR = @echo "AR $@";
65+
VERBRANLIB = @echo "RANLIB $@";
6566
else
6667
VERBC =
6768
VERBCXX =
6869
VERBLD =
6970
VERBAR =
71+
VERBRANLIB =
7072
endif
7173

7274
$(shell mkdir -p $(BINDIR))
7375

7476
CORE_CPP_FILES := \
7577
$(addprefix $(abspath $(CORE_PATH))/,\
78+
debug.cpp \
7679
StreamString.cpp \
7780
Stream.cpp \
7881
WString.cpp \
@@ -226,7 +229,10 @@ test: $(OUTPUT_BINARY) # run host test for CI
226229
$(OUTPUT_BINARY)
227230

228231
.PHONY: clean
229-
clean: clean-objects
232+
clean: clean-lcov clean-objects
233+
234+
.PHONY: clean-lcov
235+
clean-lcov:
230236
rm -rf $(LCOV_DIRECTORY)
231237

232238
.PHONY: clean-objects
@@ -379,7 +385,7 @@ FULLCORE_OBJECTS_ISOLATED = $(FULLCORE_OBJECTS:%.o=$(BINDIR)/%.o)
379385

380386
$(BINDIR)/fullcore.a: $(FULLCORE_OBJECTS_ISOLATED)
381387
$(VERBAR) $(AR) rc $@ $^
382-
$(VERBAR) $(RANLIB) $@
388+
$(VERBRANLIB) $(RANLIB) $@
383389

384390
ifeq ($(INO),)
385391

@@ -392,7 +398,7 @@ else
392398
$(VERBLD) $(CXX) $(LDFLAGS) $< $(BINDIR)/fullcore.a $(LIBSSL) -o $@
393399
mkdir -p $(BINDIR)/$(lastword $(subst /, ,$@))
394400
ln -sf $@ $(BINDIR)/$(lastword $(subst /, ,$@))
395-
@echo "----> $(BINDIR)/ <----"
401+
@echo "----> $(BINDIR)/$(lastword $(subst /, ,$@))/$(lastword $(subst /, ,$@)) <----"
396402
@[ "$(R)" = noexec ] && echo '(not running it, use `make R="[<options>]" ...` for valgrind+gdb)' || $(dir $(MAKEFILE))/valgdb $@ $(R)
397403

398404
FORCE:

0 commit comments

Comments
 (0)