Module Name: src
Committed By: martin
Date: Sat Apr 5 11:15:57 UTC 2014
Modified Files:
src/sys/arch/playstation2/conf: Makefile.playstation2.inc
build.playstation2.sh
Log Message:
Try with EXTERNAL_TOOLCHAIN instead of MISSING_TOOLCHAIN.
Still fails the same.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/arch/playstation2/conf/Makefile.playstation2.inc \
src/sys/arch/playstation2/conf/build.playstation2.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/playstation2/conf/Makefile.playstation2.inc
diff -u src/sys/arch/playstation2/conf/Makefile.playstation2.inc:1.5 src/sys/arch/playstation2/conf/Makefile.playstation2.inc:1.6
--- src/sys/arch/playstation2/conf/Makefile.playstation2.inc:1.5 Mon Mar 31 11:43:53 2014
+++ src/sys/arch/playstation2/conf/Makefile.playstation2.inc Sat Apr 5 11:15:57 2014
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.playstation2.inc,v 1.5 2014/03/31 11:43:53 martin Exp $
+# $NetBSD: Makefile.playstation2.inc,v 1.6 2014/04/05 11:15:57 martin Exp $
-.if !defined(TOOLCHAIN_MISSING) || ${TOOLCHAIN_MISSING}=="no"
+.if !defined(EXTERNAL_TOOLCHAIN) || ${EXTERNAL_TOOLCHAIN}==""
.error please do not run "make" directly, use sh ../../conf/build.playstation2.sh instead
.endif
# working around makesystem bugs: redefine CC and friends here or it does
# not properly get picked up by mkdep in sub-makes for "make depend" of
# libkern and friends - XXX fix this
-PREFIX=/usr/pkg
-PLATFORM=mips--netbsdelf
+PREFIX=${EXTERNAL_TOOLCHAIN}
+PLATFORM=mipsel--netbsdelf
CC=${PREFIX}/bin/${PLATFORM}-gcc
CPP=${PREFIX}/bin/${PLATFORM}-cpp
Index: src/sys/arch/playstation2/conf/build.playstation2.sh
diff -u src/sys/arch/playstation2/conf/build.playstation2.sh:1.5 src/sys/arch/playstation2/conf/build.playstation2.sh:1.6
--- src/sys/arch/playstation2/conf/build.playstation2.sh:1.5 Mon Mar 31 11:43:53 2014
+++ src/sys/arch/playstation2/conf/build.playstation2.sh Sat Apr 5 11:15:57 2014
@@ -3,10 +3,9 @@
# This assumes the compiler comes from pkgsrc/cross/gcc-mips-current
# (as R5900 support is not available on other branches of gcc yet)
root=/usr/pkg
-target=mips--netbsdelf
-
-TOOLCHAIN_MISSING=yes; export TOOLCHAIN_MISSING
+target=mipsel--netbsdelf
+EXTERNAL_TOOLCHAIN=${root}; export EXTERNAL_TOOLCHAIN
LD=${root}/bin/${target}-ld; export LD
CC=${root}/bin/${target}-gcc; export CC
CXX=${root}/bin/${target}-g++; export CXX
