Lines 1-4
Link Here
|
1 |
--- src/Makefile.defs.orig 2020-07-29 10:22:39 UTC |
1 |
--- src/Makefile.defs.orig 2020-09-01 08:11:08 UTC |
2 |
+++ src/Makefile.defs |
2 |
+++ src/Makefile.defs |
3 |
@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}") |
3 |
@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}") |
4 |
|
4 |
|
Lines 16-24
Link Here
|
16 |
- CC_NAME=gcc |
16 |
- CC_NAME=gcc |
17 |
+ CC_NAME=clang |
17 |
+ CC_NAME=clang |
18 |
RPAREN=) |
18 |
RPAREN=) |
19 |
CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\ |
19 |
CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version 2>/dev/null|head -n 1|\ |
20 |
sed -e 's/([^$(RPAREN)]*)//g' \ |
20 |
sed -e 's/([^$(RPAREN)]*)//g' \ |
21 |
@@ -456,7 +456,7 @@ LIBDIR ?= |
21 |
@@ -458,7 +458,7 @@ LIBDIR ?= |
22 |
ifeq ($(LIBDIR),) |
22 |
ifeq ($(LIBDIR),) |
23 |
ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') |
23 |
ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') |
24 |
ifeq ($(ARCHBSZ),64b) |
24 |
ifeq ($(ARCHBSZ),64b) |
Lines 27-44
Link Here
|
27 |
else |
27 |
else |
28 |
LIBDIR = lib |
28 |
LIBDIR = lib |
29 |
endif |
29 |
endif |
30 |
@@ -1979,12 +1979,11 @@ ifeq ($(OS), freebsd) |
|
|
31 |
ifeq ($(RAW_SOCKS), yes) |
32 |
C_DEFS+= -DUSE_RAW_SOCKS |
33 |
endif |
34 |
+ LIBS= -lm # resolv and dlopen is in libc |
35 |
ifneq ($(found_lock_method), yes) |
36 |
C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems |
37 |
found_lock_method=yes |
38 |
- LIBS+= -pthread #dlopen is in libc |
39 |
- else |
40 |
- LIBS= #dlopen is in libc |
41 |
+ LIBS+= -pthread |
42 |
endif |
43 |
# check for ver >= 4.1 |
44 |
ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) |