diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-03-09 21:04:38 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-03-09 21:04:38 +0000 |
| commit | 2d2a66d887986355cfcc83531a69cd501d0dc642 (patch) | |
| tree | d5aab43e02d9c553b29fd8a5e68d08fe12543f7a | |
| parent | 5d7dead619d285bbec9b399dee989623b4da3a67 (diff) | |
| download | buildsystem-2d2a66d887986355cfcc83531a69cd501d0dc642.tar.gz buildsystem-2d2a66d887986355cfcc83531a69cd501d0dc642.tar.bz2 | |
Fix tooling detection for amigaos4 cross compilation
svn path=/trunk/tools/buildsystem/; revision=11947
| -rw-r--r-- | makefiles/Makefile.tools | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 5901af8..c3db959 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -242,15 +242,20 @@ ifeq ($(TARGET),windows) endif # AmigaOS (3/4; m68k/ppc: we can treat them identically) -ifeq ($(TARGET),amiga) - ifeq ($(HOST),amiga) +ifeq ($(findstring amiga,$(TARGET)),amiga) + ifeq ($(findstring amiga,$(HOST)),amiga) # Building on AmigaOS # Nothing to do, as we assume the default tooling works else # Cross compiling for AmigaOS - GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-unknown-amigaos/env - GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-unknown-amigaos/cross/bin + ifeq ($(TARGET),amigaos3) + GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-unknown-amigaos/env + GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-unknown-amigaos/cross/bin + else + GCCSDK_INSTALL_ENV ?= /opt/netsurf/ppc-amigaos/env + GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/ppc-amigaos/cross/bin + endif AR__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar) CC__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) |