1.1 --- a/make/devkit/Tools.gmk Thu Apr 12 02:54:38 2018 -0700 1.2 +++ b/make/devkit/Tools.gmk Mon Apr 16 00:48:00 2018 -0700 1.3 @@ -49,8 +49,8 @@ 1.4 # Define external dependencies 1.5 1.6 # Latest that could be made to work. 1.7 -gcc_ver := gcc-4.7.3 1.8 -binutils_ver := binutils-2.22 1.9 +gcc_ver := gcc-4.8.2 1.10 +binutils_ver := binutils-2.24 1.11 ccache_ver := ccache-3.1.9 1.12 mpfr_ver := mpfr-3.0.1 1.13 gmp_ver := gmp-4.3.2 1.14 @@ -64,6 +64,7 @@ 1.15 MPC := http://www.multiprecision.org/mpc/download/${mpc_ver}.tar.gz 1.16 1.17 # RPMs in OEL5.5 1.18 +LINUX_VERSION := OEL5.5 1.19 RPM_LIST := \ 1.20 kernel-headers \ 1.21 glibc-2 glibc-headers glibc-devel \ 1.22 @@ -121,7 +122,7 @@ 1.23 BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET) 1.24 PREFIX := $(RESULT)/$(HOST) 1.25 TARGETDIR := $(PREFIX)/$(TARGET) 1.26 -SYSROOT := $(TARGETDIR)/sys-root 1.27 +SYSROOT := $(TARGETDIR)/sysroot 1.28 DOWNLOAD := $(OUTPUT_ROOT)/download 1.29 SRCDIR := $(OUTPUT_ROOT)/src 1.30 1.31 @@ -184,7 +185,7 @@ 1.32 1.33 ########################################################################################## 1.34 1.35 -# Note: MUST create a <sys-root>/usr/lib even if not really needed. 1.36 +# Note: MUST create a <sysroot>/usr/lib even if not really needed. 1.37 # gcc will use a path relative to it to resolve lib64. (x86_64). 1.38 # we're creating multi-lib compiler with 32bit libc as well, so we should 1.39 # have it anyway, but just to make sure... 1.40 @@ -459,15 +460,31 @@ 1.41 1.42 ########################################################################################## 1.43 1.44 +$(PREFIX)/devkit.info: FRC 1.45 + @echo 'Creating devkit.info in the root of the kit' 1.46 + rm -f $@ 1.47 + touch $@ 1.48 + echo '# This file describes to configure how to interpret the contents of this' >> $@ 1.49 + echo '# devkit' >> $@ 1.50 + echo '' >> $@ 1.51 + echo 'DEVKIT_NAME="$(gcc_ver) - $(LINUX_VERSION)"' >> $@ 1.52 + echo 'DEVKIT_TOOLCHAIN_PATH="$$DEVKIT_ROOT/bin"' >> $@ 1.53 + echo 'DEVKIT_SYSROOT="$$DEVKIT_ROOT/$$host/sysroot"' >> $@ 1.54 + 1.55 +########################################################################################## 1.56 + 1.57 bfdlib : $(bfdlib) 1.58 binutils : $(binutils) 1.59 rpms : $(rpms) 1.60 libs : $(libs) 1.61 sysroot : rpms libs 1.62 gcc : sysroot $(gcc) $(gccpatch) 1.63 -all : binutils gcc bfdlib 1.64 +all : binutils gcc bfdlib $(PREFIX)/devkit.info 1.65 1.66 # this is only built for host. so separate. 1.67 ccache : $(ccache) 1.68 1.69 +# Force target 1.70 +FRC: 1.71 + 1.72 .PHONY : gcc all binutils bfdlib link_libs rpms libs sysroot