--- a/make/devkit/Tools.gmk Mon Mar 12 10:04:12 2018 -0400
+++ b/make/devkit/Tools.gmk Mon Mar 12 17:00:54 2018 +0100
@@ -46,6 +46,16 @@
ARCH := $(word 1,$(subst -, ,$(TARGET)))
$(info ARCH=$(ARCH))
+ifeq ($(BASE_OS), OEL6)
+ OEL_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
+ LINUX_VERSION := OEL6.4
+else ifeq ($(BASE_OS), Fedora27)
+ OEL_URL := https://dl.fedoraproject.org/pub/fedora-secondary/releases/27/Everything/$(ARCH)/os/Packages/
+ LINUX_VERSION := Fedora 27
+else
+ $(error Unknown base OS $(BASE_OS))
+endif
+
##########################################################################################
# Define external dependencies
@@ -79,10 +89,7 @@
MPC := http://ftp.gnu.org/pub/gnu/mpc/${mpc_ver}.tar.gz
GDB := http://ftp.gnu.org/gnu/gdb/${gdb_ver}.tar.xz
-OEL_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
-
-# RPMs in OEL6.4
-LINUX_VERSION := OEL6.4
+# RPMs used by all BASE_OS
RPM_LIST := \
kernel-headers \
glibc glibc-headers glibc-devel \
@@ -180,10 +187,10 @@
RPM_ARCHS += i386 i686
endif
endif
-else ifeq ($(ARCH),i686))
- RPM_ARCHS := i386 i686
+else ifeq ($(ARCH),i686)
+ RPM_ARCHS := i386 i686 noarch
else
- RPM_ARCHS := $(ARCH)
+ RPM_ARCHS := $(ARCH) noarch
endif
RPM_FILE_LIST := $(sort $(foreach a, $(RPM_ARCHS), \
@@ -453,6 +460,12 @@
@echo 'done'
$(gdb): $(gcc)
+else
+ $(BUILDDIR)/$(gdb_ver)/Makefile:
+ $(info Faking $@, not used when cross-compiling)
+ mkdir -p $(@D)
+ echo "install:" > $@
+ @echo 'done'
endif
##########################################################################################
@@ -531,7 +544,7 @@
echo '' >> $@
echo 'DEVKIT_NAME="$(gcc_ver) - $(LINUX_VERSION)"' >> $@
echo 'DEVKIT_TOOLCHAIN_PATH="$$DEVKIT_ROOT/bin"' >> $@
- echo 'DEVKIT_SYSROOT="$$DEVKIT_ROOT/$$host/sysroot"' >> $@
+ echo 'DEVKIT_SYSROOT="$$DEVKIT_ROOT/$(TARGET)/sysroot"' >> $@
echo 'DEVKIT_EXTRA_PATH="$$DEVKIT_ROOT/bin"' >> $@
##########################################################################################