diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2013-06-19 23:41:01 +0200 |
|---|---|---|
| committer | Matthijs Kooijman <matthijs@stdin.nl> | 2013-06-19 23:44:36 +0200 |
| commit | 09840089fdb941cb445e3768f8eaf3cd495e971d (patch) | |
| tree | 910d137a3bde9a63f8b011a68b60272b3e207902 | |
| parent | a289fd7132eadda73d434a1077abb43f6f1a1b84 (diff) | |
Fix make generated_assembly
Before, .ino and .pde files would be converted to .cpp files and there
is a rule to convert those .cpp files to .s files for make
generated_assembly. However, since 1f043bb (Compile .ino and .pde files
directly) these intermediate .cpp files are no longer generated,
breaking the rule to generate .s files.
This fixes this by also generating .s files from .ino and .pde files
directly.
Closes #76
| -rw-r--r-- | arduino-mk/Arduino.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 4624e60..37598ae 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -772,8 +772,11 @@ $(OBJDIR)/%.o: %.ino $(COMMON_DEPS) | $(OBJDIR) $(CXX) -x c++ -include Arduino.h -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # generated assembly -$(OBJDIR)/%.s: $(OBJDIR)/%.cpp $(COMMON_DEPS) | $(OBJDIR) - $(CXX) -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ +$(OBJDIR)/%.s: %.pde $(COMMON_DEPS) | $(OBJDIR) + $(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + +$(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) + $(CXX) -x c++ -include Arduino.h -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ #$(OBJDIR)/%.lst: $(OBJDIR)/%.s # $(AS) -mmcu=$(MCU) -alhnd $< > $@ |