diff options
| author | batchy <batchman@free.fr> | 2017-01-21 12:22:45 +0100 |
|---|---|---|
| committer | batchy <batchman@free.fr> | 2017-01-21 12:32:25 +0100 |
| commit | 697c95e26fb23891dd43fc6c2b929363f6fb4590 (patch) | |
| tree | df55cc8f32674abed88d14e8d4050c3795af58dc | |
| parent | e126d37f9b15fd631d029d011bd2ed2a1dc99d7b (diff) | |
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.
| -rw-r--r-- | Arduino.mk | 2 | ||||
| -rw-r--r-- | HISTORY.md | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -1262,7 +1262,7 @@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) $(OBJDIR)/%.s: %.cpp $(COMMON_DEPS) | $(OBJDIR) @$(MKDIR) $(dir $@) - $(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + $(CXX) -x c++ -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # core files $(OBJDIR)/core/%.c.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR) @@ -5,6 +5,7 @@ The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list. ### In Development +- Fix: Do not include the Arduino header when calling generate_assembly on .cpp files. (https://github.com/Batchyx) ### 1.5.2 (2017-01-11) |