Lines 1-6
Link Here
|
1 |
--- src/Makefile.defs.orig 2019-10-17 11:30:50 UTC |
1 |
--- src/Makefile.defs.orig 2020-05-06 13:20:45 UTC |
2 |
+++ src/Makefile.defs |
2 |
+++ src/Makefile.defs |
3 |
@@ -245,7 +245,7 @@ YACC := $(shell echo "$${YACC}") |
3 |
@@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}") |
4 |
|
4 |
|
5 |
# find compiler name & version |
5 |
# find compiler name & version |
6 |
ifeq ($(CC),) |
6 |
ifeq ($(CC),) |
Lines 9-15
Link Here
|
9 |
endif |
9 |
endif |
10 |
LD= $(CC) |
10 |
LD= $(CC) |
11 |
CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \ |
11 |
CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \ |
12 |
@@ -259,7 +259,7 @@ MKTAGS=ctags |
12 |
@@ -271,7 +271,7 @@ MKTAGS=ctags |
13 |
#find-out the compiler's name |
13 |
#find-out the compiler's name |
14 |
|
14 |
|
15 |
ifneq (,$(findstring gcc, $(CC_LONGVER))) |
15 |
ifneq (,$(findstring gcc, $(CC_LONGVER))) |
Lines 18-24
Link Here
|
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|head -n 1|\ |
20 |
sed -e 's/([^$(RPAREN)]*)//g' \ |
20 |
sed -e 's/([^$(RPAREN)]*)//g' \ |
21 |
@@ -444,7 +444,7 @@ LIBDIR ?= |
21 |
@@ -456,7 +456,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-33
Link Here
|
27 |
else |
27 |
else |
28 |
LIBDIR = lib |
28 |
LIBDIR = lib |
29 |
endif |
29 |
endif |
30 |
@@ -1818,7 +1818,7 @@ ifeq ($(YACC),) |
30 |
@@ -1830,7 +1830,7 @@ ifeq ($(YACC),) |
31 |
endif |
31 |
endif |
32 |
YACC_FLAGS=-d -b core/cfg |
32 |
YACC_FLAGS=-d -b core/cfg |
33 |
# on solaris add -lxnet (e.g. LIBS= -lxnet) |
33 |
# on solaris add -lxnet (e.g. LIBS= -lxnet) |