1
# DP: Omit the subminor number from the go libdir
3
Index: b/src/gcc/go/Make-lang.in
4
===================================================================
5
--- a/src/gcc/go/Make-lang.in
6
+++ b/src/gcc/go/Make-lang.in
8
$(TM_H) $(RTL_H) $(TREE_H) $(TM_P_H) output.h $(TARGET_H) \
11
-CFLAGS-go/go-lang.o += -DDEFAULT_TARGET_VERSION=\"$(version)\" \
12
+short_version := $(shell echo $(version) | sed -r 's/([0-9]+\.[0-9]+).*/\1/')
14
+CFLAGS-go/go-lang.o += -DDEFAULT_TARGET_VERSION=\"$(short_version)\" \
15
-DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\"
16
go/go-lang.o: go/go-lang.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(OPTS_H) \
17
$(TREE_H) $(GIMPLE_H) $(GGC_H) $(TOPLEV_H) debug.h options.h \
18
Index: b/src/libgo/Makefile.in
19
===================================================================
20
--- a/src/libgo/Makefile.in
21
+++ b/src/libgo/Makefile.in
23
SUFFIXES = .c .go .gox .o .obj .lo .a
24
@LIBGO_IS_RTEMS_TRUE@subdirs = testsuite
26
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
27
+short_version := $(shell sed -r 's/([0-9]+\.[0-9]+)\..*/\1/' $(top_srcdir)/../gcc/BASE-VER)
28
MAINT_CHARSET = latin1
29
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
30
PWD_COMMAND = $${PWDCMD-pwd}
31
STAMP = echo timestamp >
32
toolexecdir = $(glibgo_toolexecdir)
33
toolexeclibdir = $(glibgo_toolexeclibdir)
34
-toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
35
+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(short_version)
36
WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
38
# -I/-D flags to pass when compiling.
39
Index: b/src/libgo/Makefile.am
40
===================================================================
41
--- a/src/libgo/Makefile.am
42
+++ b/src/libgo/Makefile.am
47
-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
48
+short_version := $(shell sed -r 's/([0-9]+\.[0-9]+)\..*/\1/' $(top_srcdir)/../gcc/BASE-VER)
50
MAINT_CHARSET = latin1
54
toolexecdir = $(glibgo_toolexecdir)
55
toolexeclibdir = $(glibgo_toolexeclibdir)
56
-toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias)
57
+toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(short_version)
60
LIBFFIINCS = @LIBFFIINCS@