summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2014-12-20 20:40:29 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2014-12-20 20:40:29 +0000
commitf20bfb5f98b51bfbf9ab6919961541c46dcca19f (patch)
tree50b7c275bb15a203cde5bd865d626ff6e9dd165a
parentcf639ccf2547de1eae0a17d43ab8de1b28bb3ee4 (diff)
downloadtoolchains-f20bfb5f98b51bfbf9ab6919961541c46dcca19f.tar.gz
toolchains-f20bfb5f98b51bfbf9ab6919961541c46dcca19f.tar.bz2
Get binutils from the 2.14 branch and update gcc to 4.5.4. Add extra curl args.
-rw-r--r--m68k-unknown-amigaos/Makefile4
-rw-r--r--sdk/Makefile1
2 files changed, 3 insertions, 2 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 04ee02b..879e9ea 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -1,11 +1,11 @@
-UPSTREAM_GCC_VERSION := 4.5.1
+UPSTREAM_GCC_VERSION := 4.5.4
UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2
UPSTREAM_GCC_URI := http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TARBALL)
UPSTREAM_BINUTILS_VERSION := 2.14
# Not a tarball; so sue me
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION)
-UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/tags/before-merge-with-binutils-2.18/binutils/
+UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/branches/binutils/$(UPSTREAM_BINUTILS_VERSION)/
UPSTREAM_GMP_VERSION := 4.3.2
UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2
diff --git a/sdk/Makefile b/sdk/Makefile
index 8d02603..db054b7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -128,6 +128,7 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared --without-random
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver
endif
ifeq ($(SDK_ITEMS),)