diff options
| author | Sudar Muthu <sudar@sudarmuthu.com> | 2017-01-24 09:50:25 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-24 09:50:25 +0530 |
| commit | 12522f3726f11ed884d3ebb0bf22650f707b0fb1 (patch) | |
| tree | df55cc8f32674abed88d14e8d4050c3795af58dc | |
| parent | 7a14d670ebfee5df31fb71005b69b4744528a307 (diff) | |
| parent | 697c95e26fb23891dd43fc6c2b929363f6fb4590 (diff) | |
Merge pull request #475 from Batchyx/master
Fix generate_assembly for cpp files.
| -rw-r--r-- | Arduino.mk | 2 | ||||
| -rw-r--r-- | HISTORY.md | 3 |
2 files changed, 4 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) @@ -4,6 +4,9 @@ A Makefile for Arduino Sketches 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) - New: Add LTO support for users with avr-gcc > 4.9 (issue #446 & #456) (https://github.com/sej7278) |