Skip to content

Commit c11298d

Browse files
committed
we need to compile eusg with --no-as-needed, otherwise eusg removes depenency to libeusgeo.so, because no functions is used in eusg.
1 parent 437eeab commit c11298d

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

lisp/Makefile.Darwin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ XVERSION=X_V11R6_1
3030
#
3131
# for Linux
3232

33-
GCC_VERSION=$(shell gcc -dumpversion | sed s/\\..\*//)
33+
GCC_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed s/\\..\*//)
3434
ifeq ($(GCC_VERSION), 2)
3535
CPU_OPTIMIZE=-m486
3636
ALIGN_FUNCTIONS="-malign-functions=4"

lisp/Makefile.Linux

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ LD ?= ld
3636
#
3737
# for Linux
3838

39-
GCC_MAJOR_VERSION=$(shell $(CC) -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\+\).*/\1/')
40-
GCC_MINOR_VERSION=$(shell $(CC) -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\+\).*/\2/')
41-
# GCC_PATCH_VERSION=$(shell gcc -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\.\([0-9]\)/\3/')
39+
GCC_MAJOR_VERSION=$(shell $(CC) -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\+\).*/\1/')
40+
GCC_MINOR_VERSION=$(shell $(CC) -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\+\).*/\2/')
41+
# GCC_PATCH_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\.\([0-9]\)/\3/')
4242
ifneq (,$(findstring 64,$(shell $(CC) -dumpmachine)))
4343
ifeq ($(GCC_MAJOR_VERSION), 2)
4444
ALIGN_FUNCTIONS="-malign-functions=8"

lisp/Makefile.Linux.thread

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ XVERSION=X_V11R6_1
3030
#
3131
# for Linux
3232

33-
GCC_MAJOR_VERSION=$(shell gcc -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\([\.0-9]*\)/\1/')
34-
GCC_MINOR_VERSION=$(shell gcc -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\([\.0-9]*\)/\2/')
33+
GCC_MAJOR_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\([\.0-9]*\)/\1/')
34+
GCC_MINOR_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\([\.0-9]*\)/\2/')
3535
ifeq ($(GCC_MAJOR_VERSION), 2)
3636
CPU_OPTIMIZE=-m486
3737
ALIGN_FUNCTIONS="-malign-functions=4"

lisp/Makefile.Linux64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ XVERSION=X_V11R6_1
2929
#
3030
# for Linux
3131

32-
GCC_MAJOR_VERSION=$(shell gcc -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\+\).*/\1/')
33-
GCC_MINOR_VERSION=$(shell gcc -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\+\).*/\2/')
34-
# GCC_PATCH_VERSION=$(shell gcc -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\.\([0-9]\)/\3/')
32+
GCC_MAJOR_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\+\).*/\1/')
33+
GCC_MINOR_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\+\).*/\2/')
34+
# GCC_PATCH_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\.\([0-9]\)/\3/')
3535

3636
ADD_LDFLAGS=
3737
ifneq (,$(findstring t,$(shell if [ \( $(GCC_MAJOR_VERSION) -eq 4 -a $(GCC_MINOR_VERSION) -ge 5 \) -o $(GCC_MAJOR_VERSION) -ge 5 ] ; then echo t ;fi )))

lisp/Makefile.LinuxARM

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ XVERSION=X_V11R6_1
3838
#MACHINE=armv5te
3939
MACHINE=$(shell uname -m | sed 's/\(armv[0-9]\).*/\1/')
4040

41-
GCC_MAJOR_VERSION=$(shell gcc -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\([\.0-9]*\)/\1/')
42-
GCC_MINOR_VERSION=$(shell gcc -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\([\.0-9]*\)/\2/')
41+
GCC_MAJOR_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\([\.0-9]*\)/\1/')
42+
GCC_MINOR_VERSION=$(shell gcc -dumpfullversion -dumpversion | sed -e 's/\([0-9]\)\.\([0-9]\)\([\.0-9]*\)/\2/')
4343
ifeq ($(GCC_MAJOR_VERSION), 2)
4444
CPU_OPTIMIZE=
4545
ALIGN_FUNCTIONS="-malign-functions=4"

lisp/Makefile.LinuxSH4.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CC_NATIVE=gcc
3838
#
3939
# for Linux
4040

41-
GCC_VERSION=$(shell $(CC) -dumpversion | sed s/\\..\*//)
41+
GCC_VERSION=$(shell $(CC) -dumpfullversion -dumpversion | sed s/\\..\*//)
4242
ifeq ($(GCC_VERSION), 2)
4343
CPU_OPTIMIZE=-m486
4444
ALIGN_FUNCTIONS=-malign-functions=4

0 commit comments

Comments
 (0)