Skip to content

Commit 697c95e

Browse files
committed
Arduino.mk: Fix generating assembly for cpp files.
Do not include the Arduino header when generating assembly for .cpp files with generate_assembly. This was likely a copy-paste error.
1 parent e126d37 commit 697c95e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Arduino.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1262,7 +1262,7 @@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR)
12621262

12631263
$(OBJDIR)/%.s: %.cpp $(COMMON_DEPS) | $(OBJDIR)
12641264
@$(MKDIR) $(dir $@)
1265-
$(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@
1265+
$(CXX) -x c++ -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@
12661266

12671267
# core files
12681268
$(OBJDIR)/core/%.c.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR)

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ The following is the rough list of changes that went into different versions.
55
I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
66

77
### In Development
8+
- Fix: Do not include the Arduino header when calling generate_assembly on .cpp files. (https://github.com/Batchyx)
89

910
### 1.5.2 (2017-01-11)
1011

0 commit comments

Comments
 (0)