diff options
| author | Aidan MacDonald <amachronic@protonmail.com> | 2021-02-27 22:05:39 +0000 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2021-02-27 22:51:52 +0000 |
| commit | 6224efb238a08019c22ec09164abb578c42a35f6 (patch) | |
| tree | 6ed72be35622ba99ce4f0dc1d96f8a98e9956571 | |
| parent | 96019d23aaf65e0d12971ec2a209824e45026898 (diff) | |
| download | rockbox-6224efb238a08019c22ec09164abb578c42a35f6.tar.gz rockbox-6224efb238a08019c22ec09164abb578c42a35f6.tar.bz2 rockbox-6224efb238a08019c22ec09164abb578c42a35f6.zip | |
Fix build system not respecting TOOLSET
It seems that 'toolset=' in tools/configure was set but not used, with
the build system only generating a hardcoded set of tools. This change
fixes the issue by exporting the required tools in the TOOLSET variable,
and having root.make append those to the TOOLS list.
Change-Id: I07024bdf1dd2260c32cfeecaba0d3bb5bf00346d
| -rwxr-xr-x | tools/configure | 1 | ||||
| -rw-r--r-- | tools/root.make | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/configure b/tools/configure index 36e951e4d2..07d90b26ef 100755 --- a/tools/configure +++ b/tools/configure @@ -4816,6 +4816,7 @@ export ANDROID_ARCH=${ANDROID_ARCH} export ANDROID_NDK_PATH=${ANDROID_NDK_PATH} export ANDROID_SDK_PATH=${ANDROID_SDK_PATH} export ANDROID_PLATFORM_VERSION=${ANDROID_PLATFORM_VERSION} +export TOOLSET=${toolset} CONFIGURE_OPTIONS=${cmdline} diff --git a/tools/root.make b/tools/root.make index 3f5b4bca17..296ca849de 100644 --- a/tools/root.make +++ b/tools/root.make @@ -23,6 +23,7 @@ TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ $(TOOLSDIR)/codepages $(TOOLSDIR)/scramble $(TOOLSDIR)/bmp2rb \ $(TOOLSDIR)/uclpack $(TOOLSDIR)/mkboot $(TOOLSDIR)/iaudio_bl_flash.c \ $(TOOLSDIR)/iaudio_bl_flash.h +TOOLS += $(foreach tool,$(TOOLSET),$(TOOLSDIR)/$(tool)) ifeq (,$(PREFIX)) |