toolchain name update

diff --git a/script b/script
index 385f839b28c140ab7764364235d09edb529becd2..7eb8016d3a6a4126349e8fe19b5d991ecc883f06 100755 (executable)
--- a/script
+++ b/script
@@ -34,16 +34,16 @@ dirx () {
 
 stdconfigure () {
         dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \
-                /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-configure ./configure \
+                /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-configure ./configure \
                 --prefix=/local/scratch/Rump-kernels/prefix --disable-shared
 }
 
 stdmake () {
-        dirx /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-make -j4
+        dirx /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-make -j4
 }
 
 stdmakeinstall () {
-        dirx /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-make install
+        dirx /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-make install
 }
 
 want () {
@@ -54,7 +54,7 @@ want () {
 }
 
 gettar zlib-1.2.8 http://zlib.net/zlib-1.2.8.tar.gz
-dirx env CC=/local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-cc \
+dirx env CC=/local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-gcc \
         ./configure --static --prefix=/local/scratch/Rump-kernels/prefix \
                 --libdir=/local/scratch/Rump-kernels/prefix/lib \
                 --includedir=/local/scratch/Rump-kernels/prefix/include
@@ -67,7 +67,7 @@ want libffi-3.1 ftp://sourceware.org/pub/libffi/libffi-3.1.tar.gz
 gettar gettext-0.19.4 http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.4.tar.xz
 ## don't disable nls otherwise libintl won't be compiled!!
 dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config         \
-       /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-configure ./configure \
+       /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-configure ./configure \
        --prefix=/local/scratch/Rump-kernels/prefix --disable-shared \
        --disable-java --disable-native-java --disable-c++ --disable-openmp \
        --disable-acl --disable-curses  --disable-libasprintf \
@@ -84,7 +84,7 @@ gettar glib-2.32.4 http://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.4.
 dirx env CPPFLAGS="-DSTDC_HEADERS" CFLAGS="-I/local/scratch/Rump-kernels/prefix/include" \
         LDFLAGS="-L/local/scratch/Rump-kernels/prefix/lib" \
         PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config                  \
-        /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-configure ./configure                 \
+        /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-configure ./configure                 \
         --prefix=/local/scratch/Rump-kernels/prefix --disable-shared  \
         glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_header_pwd_h=yes \
         ac_cv_func_posix_getpwuid_r=yes ac_cv_header_grp_h=yes \
@@ -95,9 +95,9 @@ stdmakeinstall
 
 gettar pixman-0.32.6 http://cairographics.org/releases/pixman-0.32.6.tar.gz
 dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \
-       /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-configure ./configure \
+       /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-configure ./configure \
        --prefix=/local/scratch/Rump-kernels/prefix --disable-shared --enable-static
-dirx /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-make -j4 CPPFLAGS="-U__SSE2__"
+dirx /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-make -j4 CPPFLAGS="-U__SSE2__"
 stdmakeinstall
 
 
@@ -106,12 +106,12 @@ stdmakeinstall
 # that Paths.mk doesn't get generate if only ./configure in tools
 setdir /local/scratch/Rump-kernels/xen.git
 dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \
-               /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-configure ./configure \
+               /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-configure ./configure \
                --prefix=/local/scratch/Rump-kernels/prefix \
                --with-xen-dumpdir=/local/scratch/Rump-kernels/prefix/var/lib/xen/dump
 setdir /local/scratch/Rump-kernels/xen.git/tools
 dirx env PKG_CONFIG=/local/scratch/Rump-kernels/rump-build-script-junk/pkg-config \
-       make V=1 CC=/local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-cc -j4 CPPFLAGS="-U__SSE2__"
+       make V=1 CC=/local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-gcc -j4 CPPFLAGS="-U__SSE2__"
 stdmakeinstall
 
 # build qemu
@@ -121,7 +121,7 @@ CPPFLAGS="-U__SSE2__" \
  ./configure \
  --enable-xen \
  --disable-linux-user \
- --cc=/local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-cc \
+ --cc=/local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-gcc \
  --static --cxx=false \
  --target-list=i386-softmmu \
                 --enable-debug --enable-trace-backend=stderr \
@@ -147,5 +147,5 @@ CPPFLAGS="-U__SSE2__" \
                 --with-coroutine=gthread --disable-coroutine-pool \
                 --audio-drv-list= \
                 --disable-stack-protector
-dirx /local/scratch/Rump-kernels/rumprun/app-tools/rumprun-xen-make -j4 CPPFLAGS="-U__SSE2__"
+dirx /local/scratch/Rump-kernels/rumprun/app-tools/x86_64-rumprun-netbsd-make -j4 CPPFLAGS="-U__SSE2__"
 stdmakeinstall