aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HAL_SITL: Fixing SITL build for OSX.

Browse Source
This commit is contained in:
John Boiles 2013-07-04 23:01:16 +07:00 committed by Andrew Tridgell
parent a694b781c7
commit bb2a6b8a22
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_HAL_AVR_SITL/UARTDriver.cpp
View File

@ -33,6 +33,14 @@ using namespace AVR_SITL;
#define LISTEN_BASE_PORT 5760 #define LISTEN_BASE_PORT 5760
// On OSX, MSG_NOSIGNAL doesn't exist. The equivalent is to set SO_NOSIGPIPE
// in setsockopt for the socket. However, if we just skip that, and don't use
// MSG_NOSIGNAL, everything seems to work fine and SIGPIPE doesn't seem to be
// generated.
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
bool SITLUARTDriver::_console; bool SITLUARTDriver::_console;
/* UARTDriver method implementations */ /* UARTDriver method implementations */

6
mk/board_avr_sitl.mk
View File

@ -18,7 +18,10 @@ CXXOPTS = -ffunction-sections -fdata-sections -fno-exceptions -fsigned
COPTS = -ffunction-sections -fdata-sections -fsigned-char COPTS = -ffunction-sections -fdata-sections -fsigned-char
ASOPTS = -x assembler-with-cpp ASOPTS = -x assembler-with-cpp
ifneq ($(SYSTYPE),Darwin)
LISTOPTS = -adhlns=$(@:.o=.lst) LISTOPTS = -adhlns=$(@:.o=.lst)
endif
CPUFLAGS = -D_GNU_SOURCE CPUFLAGS = -D_GNU_SOURCE
CPULDFLAGS = -g CPULDFLAGS = -g
@ -31,7 +34,10 @@ CFLAGS += $(WARNFLAGS) $(DEPFLAGS) $(COPTS)
ASFLAGS = -g $(CPUFLAGS) $(DEFINES) -Wa,$(LISTOPTS) $(DEPFLAGS) ASFLAGS = -g $(CPUFLAGS) $(DEFINES) -Wa,$(LISTOPTS) $(DEPFLAGS)
ASFLAGS += $(ASOPTS) ASFLAGS += $(ASOPTS)
LDFLAGS = -g $(CPUFLAGS) $(OPTFLAGS) $(WARNFLAGS) LDFLAGS = -g $(CPUFLAGS) $(OPTFLAGS) $(WARNFLAGS)
ifneq ($(SYSTYPE),Darwin)
LDFLAGS += -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP) LDFLAGS += -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP)
endif
LIBS = -lm LIBS = -lm