zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Build: update makefile for SITL build

mission-4.1.18
Andrew Tridgell 12 years ago
parent
e82deca305
commit
9b15d0e714
1 changed files with 28 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      libraries/AP_Common/Arduino.mk

37
libraries/AP_Common/Arduino.mk
Unescape View File

@ -206,15 +206,26 @@ FIND_TOOL = $(firstword $(wildcard $(addsuffix /$(1),$(TOOLPATH))))
else else
FIND_TOOL = $(firstword $(wildcard $(addsuffix /$(1).exe,$(TOOLPATH)))) FIND_TOOL = $(firstword $(wildcard $(addsuffix /$(1).exe,$(TOOLPATH))))
endif endif
ifeq ($(HAL_BOARD),HAL_BOARD_AVR_SITL)
CXX := $(call FIND_TOOL,g++)
CC := $(call FIND_TOOL,gcc)
AS := $(call FIND_TOOL,gcc)
AR := $(call FIND_TOOL,ar)
LD := $(call FIND_TOOL,g++)
GDB := $(call FIND_TOOL,gdb)
OBJCOPY := $(call FIND_TOOL,objcopy)
else
CXX := $(call FIND_TOOL,avr-g++) CXX := $(call FIND_TOOL,avr-g++)
CC := $(call FIND_TOOL,avr-gcc) CC := $(call FIND_TOOL,avr-gcc)
AS := $(call FIND_TOOL,avr-gcc) AS := $(call FIND_TOOL,avr-gcc)
AR := $(call FIND_TOOL,avr-ar) AR := $(call FIND_TOOL,avr-ar)
LD := $(call FIND_TOOL,avr-gcc) LD := $(call FIND_TOOL,avr-gcc)
GDB := $(call FIND_TOOL,avr-gdb) GDB := $(call FIND_TOOL,avr-gdb)
AVRDUDE := $(call FIND_TOOL,avrdude) AVRDUDE := $(call FIND_TOOL,avrdude)
AVARICE := $(call FIND_TOOL,avarice) AVARICE := $(call FIND_TOOL,avarice)
OBJCOPY := $(call FIND_TOOL,avr-objcopy) OBJCOPY := $(call FIND_TOOL,avr-objcopy)
endif
ifeq ($(CXX),) ifeq ($(CXX),)
$(error ERROR: cannot find the compiler tools anywhere on the path $(TOOLPATH)) $(error ERROR: cannot find the compiler tools anywhere on the path $(TOOLPATH))
endif endif
@ -234,19 +245,27 @@ OPTFLAGS = -Os -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-str
DEPFLAGS = -MD -MT $@ DEPFLAGS = -MD -MT $@
# XXX warning options TBD # XXX warning options TBD
CXXOPTS = -mcall-prologues -ffunction-sections -fdata-sections -fno-exceptions CXXOPTS = -ffunction-sections -fdata-sections -fno-exceptions
COPTS = -mcall-prologues -ffunction-sections -fdata-sections COPTS = -ffunction-sections -fdata-sections
ASOPTS = -x assembler-with-cpp ASOPTS = -x assembler-with-cpp
LISTOPTS = -adhlns=$(@:.o=.lst) LISTOPTS = -adhlns=$(@:.o=.lst)
CXXFLAGS = -g -mmcu=$(MCU) $(DEFINES) -Wa,$(LISTOPTS) $(OPTFLAGS) $(DEPFLAGS) $(CXXOPTS) ifeq ($(HAL_BOARD),HAL_BOARD_AVR_SITL)
CFLAGS = -g -mmcu=$(MCU) $(DEFINES) -Wa,$(LISTOPTS) $(OPTFLAGS) $(DEPFLAGS) $(COPTS) CPUFLAGS = -D_GNU_SOURCE
ASFLAGS = -g -mmcu=$(MCU) $(DEFINES) -Wa,$(LISTOPTS) $(DEPFLAGS) $(ASOPTS) CPULDFLAGS =
LDFLAGS = -g -mmcu=$(MCU) $(OPTFLAGS) -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP) -Wl,-m,avr6 else
CPUFLAGS = -mmcu=$(MCU) -mcall-prologues
CPULDFLAGS = -Wl,-m,avr6
endif
CXXFLAGS = -g $(CPUFLAGS) $(DEFINES) -Wa,$(LISTOPTS) $(OPTFLAGS) $(DEPFLAGS) $(CXXOPTS)
CFLAGS = -g $(CPUFLAGS) $(DEFINES) -Wa,$(LISTOPTS) $(OPTFLAGS) $(DEPFLAGS) $(COPTS)
ASFLAGS = -g $(CPUFLAGS) $(DEFINES) -Wa,$(LISTOPTS) $(DEPFLAGS) $(ASOPTS)
LDFLAGS = -g $(CPUFLAGS) $(OPTFLAGS) -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP) $(CPULDFLAGS)
ifeq ($(BOARD),mega) ifeq ($(BOARD),mega)
LDFLAGS = -g -mmcu=$(MCU) $(OPTFLAGS) -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP) LDFLAGS = -g $(CPUFLAGS) $(OPTFLAGS) -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP)
endif endif
# under certain situations with certain avr-gcc versions the --relax flag causes # under certain situations with certain avr-gcc versions the --relax flag causes

Write Preview
Loading…
Cancel
Save