blob: f82484951f762125f8bd7e7abb56e16c44c62d0f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
# DP: Omit the subminor number from the go libdir
Index: b/src/gcc/go/Make-lang.in
===================================================================
--- a/src/gcc/go/Make-lang.in
+++ b/src/gcc/go/Make-lang.in
@@ -219,7 +219,9 @@ go.stageprofile: stageprofile-start
go.stagefeedback: stagefeedback-start
-mv go/*$(objext) stagefeedback/go
-CFLAGS-go/go-lang.o += -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+short_version := $(shell echo $(version) | sed -r 's/([0-9]+).*/\1/')
+
+CFLAGS-go/go-lang.o += -DDEFAULT_TARGET_VERSION=\"$(short_version)\" \
-DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\"
GOINCLUDES = -I $(srcdir)/go -I $(srcdir)/go/gofrontend
Index: b/src/libgo/Makefile.in
===================================================================
--- a/src/libgo/Makefile.in
+++ b/src/libgo/Makefile.in
@@ -498,14 +498,15 @@ SUFFIXES = .c .go .gox .o .obj .lo .a
@LIBGO_IS_RTEMS_TRUE@subdirs = testsuite
SUBDIRS = ${subdirs}
gcc_version := $(shell $(GOC) -dumpversion)
+short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+)\..*/\1/')
MAINT_CHARSET = latin1
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
toolexecdir = $(glibgo_toolexecdir)
toolexeclibdir = $(glibgo_toolexeclibdir)
-toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
-libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(gcc_version)
+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(short_version)
+libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(short_version)
WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
# -I/-D flags to pass when compiling.
Index: b/src/libgo/Makefile.am
===================================================================
--- a/src/libgo/Makefile.am
+++ b/src/libgo/Makefile.am
@@ -16,6 +16,7 @@ endif
SUBDIRS = ${subdirs}
gcc_version := $(shell $(GOC) -dumpversion)
+short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+)\..*/\1/')
MAINT_CHARSET = latin1
@@ -25,8 +26,8 @@ STAMP = echo timestamp >
toolexecdir = $(glibgo_toolexecdir)
toolexeclibdir = $(glibgo_toolexeclibdir)
-toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
-libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(gcc_version)
+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(short_version)
+libexecsubdir = $(libexecdir)/gcc/$(target_alias)/$(short_version)
LIBFFI = @LIBFFI@
LIBFFIINCS = @LIBFFIINCS@
Index: b/src/gotools/Makefile.am
===================================================================
--- a/src/gotools/Makefile.am
+++ b/src/gotools/Makefile.am
@@ -18,8 +18,9 @@
ACLOCAL_AMFLAGS = -I ./config -I ../config
gcc_version := $(shell $(GCC_FOR_TARGET) -dumpversion)
+short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+)\..*/\1/')
-libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(short_version)
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
Index: b/src/gotools/Makefile.in
===================================================================
--- a/src/gotools/Makefile.in
+++ b/src/gotools/Makefile.in
@@ -247,7 +247,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ./config -I ../config
gcc_version := $(shell $(GCC_FOR_TARGET) -dumpversion)
-libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+)\..*/\1/')
+libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(short_version)
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
PWD_COMMAND = $${PWDCMD-pwd}
STAMP = echo timestamp >
|
