PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix segmentation fault when -p command line option used. 

We need to define a couple more symbols for glibc >= 2.24.

Complete details:
https://github.com/wb2osz/direwolf/issues/62

	modified:   Makefile.linux
	modified:   Makefile.macosx
This commit is contained in:
WB2OSZ 2016-12-21 08:47:08 -05:00
parent 01857c196e
commit 40047e91d9
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.linux
View File

@ -12,7 +12,14 @@ all : $(APPS) direwolf.desktop direwolf.conf
@echo " " @echo " "
CC := gcc CC := gcc
CFLAGS := -O3 -pthread -Igeotranz
# _XOPEN_SOURCE=600 and _DEFAULT_SOURCE=1 are needed for glibc >= 2.24.
# Explanation here: https://github.com/wb2osz/direwolf/issues/62
# There are a few source files where it had been necessary to define __USE_XOPEN2KXSI,
# __USE_XOPEN, or _POSIX_C_SOURCE. Doesn't seem to be needed after adding this.
CFLAGS := -O3 -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1
LDFLAGS := -lm -lpthread -lrt LDFLAGS := -lm -lpthread -lrt
@ -91,7 +98,7 @@ endif
# 245 # 245
# 75 -01 # 75 -01
# 72 -02 # 72 -02
# 71 -03 # 71 -03
# 73 -O3 -march=native # 73 -O3 -march=native
# 42 -O3 -ffast-math # 42 -O3 -ffast-math
# 42 -Ofast (note below) # 42 -Ofast (note below)

7
Makefile.macosx
View File

@ -71,7 +71,12 @@ endif
#CC := $(DARWIN_CC) -m64 $(SYS_LIBS) $(SYS_MIN) #CC := $(DARWIN_CC) -m64 $(SYS_LIBS) $(SYS_MIN)
CC := $(DARWIN_CC) -m32 $(SYS_LIBS) $(SYS_MIN) CC := $(DARWIN_CC) -m32 $(SYS_LIBS) $(SYS_MIN)
CFLAGS := -Os -pthread -Igeotranz $(EXTRA_CFLAGS)
# _XOPEN_SOURCE=600 and _DEFAULT_SOURCE=1 are needed for glibc >= 2.24.
# Explanation here: https://github.com/wb2osz/direwolf/issues/62
CFLAGS := -Os -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1 $(EXTRA_CFLAGS)
# $(info $$CC is [${CC}]) # $(info $$CC is [${CC}])
# #