Use destdir/rumprun-$MACHINE_GNU_ARCH$ as a GNU-like prefix.

diff --git a/app-tools/Makefile b/app-tools/Makefile
index c2b663f17e230b7c0de455e81c50b9ade955c339..c7807855a2c419b7dd3e922e18db145e1fc1c1cf 100644 (file)
--- a/app-tools/Makefile
+++ b/app-tools/Makefile
@@ -42,6 +42,8 @@ BRSOURCEDIR:=$(dir ${AR})
 BRLIBEXECINST:= ${INSTALLDIR}/libexec/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/
 BRLIBEXECDEST:= ${RRDEST}/libexec/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/
 
+INSTALLDIR_ARCH:= ${INSTALLDIR}/rumprun-${MACHINE_GNU_ARCH}
+
 ARCHDIR:= rumprun-${MACHINE_GNU_ARCH}
 MACHDIR:= rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}
 
@@ -94,6 +96,9 @@ ${BRLIBEXECINST}:
 ${INSTALLDIR}/etc:
        mkdir -p $@
 
+${INSTALLDIR_ARCH}/share:
+       mkdir -p $@
+
 install-buildrumpwrappers: ${BRLIBEXECINST} ${BRTOOLS}
        install -m 0755 ${BRTOOLS} ${CC} ${CXX} ${BRLIBEXECINST}
        install -m 0755 ${BRSOURCEDIR}/brprintmetainfo ${BRLIBEXECINST}
@@ -104,10 +109,10 @@ install-bins: ${GENS.bin} ${STATICBIN}
        ln -f ${INSTALLDIR}/bin/rumprun-bake ${INSTALLDIR}/bin/rumpbake
 
 install-files: ${GENS.files} ${GENS.archspecs} ${GENS.machspecs} \
-    ${INSTALLDIR}/etc
-       install -m 0644 ${GENS.files} ${INSTALLDIR}/share
-       install -m 0644 ${GENS.archspecs} ${INSTALLDIR}/lib/${ARCHDIR}
-       install -m 0644 ${GENS.machspecs} ${INSTALLDIR}/lib/${MACHDIR}
+    ${INSTALLDIR}/etc ${INSTALLDIR_ARCH}/share
+       install -m 0644 ${GENS.files} ${INSTALLDIR_ARCH}/share
+       install -m 0644 ${GENS.archspecs} ${INSTALLDIR_ARCH}/lib
+       install -m 0644 ${GENS.machspecs} ${INSTALLDIR_ARCH}/lib/rumprun-${PLATFORM}
        install -m 0644 rumprun-bake.conf ${INSTALLDIR}/etc
 
 install: install-buildrumpwrappers install-bins install-files

diff --git a/app-tools/cc.in b/app-tools/cc.in
index 5b72a5e7682b3222f0b0dcb35effa98556abf663..f5fd8329ca1e03ed86214925e81d2181450b1271 100644 (file)
--- a/app-tools/cc.in
+++ b/app-tools/cc.in
@@ -70,7 +70,7 @@ done
 case ${MODE} in
 compile)
        exec ${CC} ${CFLAGS} -no-integrated-cpp \
-           -specs=!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!/specs-compile_or_ferment \
+           -specs=!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib/specs-compile_or_ferment \
            "$@" ${EXTRALIBS}
        ;;
 ferment)
@@ -80,9 +80,9 @@ ferment)
        # with no rump components. '-u main' is necessary to pull in main if the
        # user is linking it in from a library.
        ${CC} ${CFLAGS} -no-integrated-cpp \
-           -specs=!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!/specs-compile_or_ferment \
+           -specs=!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib/specs-compile_or_ferment \
            -Wl,-r -Wl,-u,main \
-           "$@" !DESTDIR!/share/!TOOLTUPLE!-recipe.s ${EXTRALIBS} || die
+           "$@" !DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/share/!TOOLTUPLE!-recipe.s ${EXTRALIBS} || die
 
        # If the presumed output file did not change, and the compiler
        # did not flag an error, assume this is a command which does not
@@ -102,7 +102,7 @@ ferment)
 
        # Try a stub link with minimal rump components. If that fails then stop.
        ${CC} ${CFLAGS} -no-integrated-cpp \
-           -specs=!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!/specs-stub \
+           -specs=!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib/specs-stub \
            ${OUTFILE} -o /dev/null
        if [ $? -ne 0 ]; then
                if [ "${RUMPRUN_STUBLINK}" = "succeed" ]; then

diff --git a/app-tools/rumprun-bake.in b/app-tools/rumprun-bake.in
index 3c4b8ca2c0e4c73270465127d7b3369541eaa0c4..239a44862269e253a1c165b875c90b9fcf18b447 100644 (file)
--- a/app-tools/rumprun-bake.in
+++ b/app-tools/rumprun-bake.in
@@ -365,7 +365,7 @@ MACHINE_GNU_ARCH=${RUMPBAKE_TUPLE%%-*}
 
 # Final link using cc to produce the unikernel image.
 ${runcmd} ${RUMPBAKE_BACKINGCC} ${RUMPBAKE_CFLAGS}                     \
-    -specs=${RUMPBAKE_TOOLDIR}/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/specs-bake \
+    -specs=${RUMPBAKE_TOOLDIR}/rumprun-${MACHINE_GNU_ARCH}/lib/rumprun-${PLATFORM}/specs-bake \
     -o ${OUTPUT} ${allobjs}                                            \
     -Wl,--whole-archive ${LIBS} || exit 1
 

diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in
index de6440883ae8ecc49f27dcf6028b1fdb18487bb5..e33e1fc855f3256d6db1a6b7c4bebcd786662f35 100644 (file)
--- a/app-tools/specs-bake.in
+++ b/app-tools/specs-bake.in
@@ -1,16 +1,16 @@
 *startfile:
-!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!-!PLATFORM!/rumprun.o
+!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib/rumprun-!PLATFORM!/rumprun.o
 
 *endfile:
 
 
 *lib:
-!LDFLAGS_BAKE! -L!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!-!PLATFORM!   \
+!LDFLAGS_BAKE! -L!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib/rumprun-!PLATFORM!   \
     --whole-archive -lrump --no-whole-archive                          \
     --start-group -lrumprun_base -lpthread -lc --end-group
 
 *link:
-%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} -T !DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!-!PLATFORM!.ldscript %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
+%{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} -T !DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib/!PLATFORM!.ldscript %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}
 
 %rename link_libgcc old_link_libgcc
 

diff --git a/app-tools/specs-compile_or_ferment.in b/app-tools/specs-compile_or_ferment.in
index cadd464889d7f4e6e9215bb99c1de8fdee20739c..2b4b7f3350528e82b3c05a0e0c4f9d015f484efe 100644 (file)
--- a/app-tools/specs-compile_or_ferment.in
+++ b/app-tools/specs-compile_or_ferment.in
@@ -1,7 +1,7 @@
 %rename cpp_options old_cpp_options
  
 *cpp_options:
--nostdinc -isystem !DESTDIR!/include/rumprun %{,c++:%{!std=*:-std=c++11}} %{,c++:-isystem !DESTDIR!/include/rumprun/c++} %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__
+-nostdinc -isystem !DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/include %{,c++:%{!std=*:-std=c++11}} %{,c++:-isystem !DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/include/c++} %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__
 
 %rename cc1_options old_cc1_options
 
@@ -18,7 +18,7 @@
 
 
 *lib:
--L!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!
+-L!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib
 
 *link:
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} %:remove-outfile(-lstdc++) %{rdynamic:}

diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in
index 05bd9688814067f0d84b6c5603189962b348d22d..d9dfb7f9424b9d7136d1d236581222c5d060d4a6 100644 (file)
--- a/app-tools/specs-stub.in
+++ b/app-tools/specs-stub.in
@@ -5,9 +5,9 @@
 
 
 *lib:
--L!DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!             \
-    --start-group -lpthread -lc --end-group    \
-    !DESTDIR!/lib/rumprun-!MACHINE_GNU_ARCH!/pseudolinkstubs.o
+-L!DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib             \
+    --start-group -lpthread -lc --end-group            \
+    !DESTDIR!/rumprun-!MACHINE_GNU_ARCH!/lib/pseudolinkstubs.o
 
 *link:
 %{m64:-m elf_x86_64;mx32:-m elf32_x86_64;m32:-m elf_i386} %:replace-outfile(-lstdc++ -lc++) %{rdynamic:}

diff --git a/build-rr.sh b/build-rr.sh
index e0953e72e827576c7e78683186513a5bf21830c1..5bb57a439f86cd5b0606462b6e0c77625b322359 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -395,9 +395,7 @@ dobuild ()
        . ${PLATFORMDIR}/platform.conf
 
        buildrump "$@"
-       mkdir -p ${STAGING}/lib/rumprun-${MACHINE_GNU_ARCH} \
-           || die cannot create libdir
-       mkdir -p ${STAGING}/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM} \
+       mkdir -p ${STAGING}/rumprun-${MACHINE_GNU_ARCH}/lib/rumprun-${PLATFORM}\
            || die cannot create libdir
 
        ${MAKE} -C ${PLATFORMDIR} links
@@ -423,7 +421,7 @@ doinstall ()
        # remove in a few months.
        rm -f ${RRDEST} > /dev/null 2>&1 || true
 
-       mkdir -p ${RRDEST}/include/rumprun \
+       mkdir -p ${RRDEST}/rumprun-${MACHINE_GNU_ARCH}/include \
            || die cannot create ${RRDEST}/include/rumprun
 
        # copy everything except include
@@ -432,15 +430,15 @@ doinstall ()
                cd ${STAGING}
                rm -rf lib/pkgconfig
                find lib -maxdepth 1 -name librump\*.a \
-                   -exec mv -f '{}' lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/ \;
+                   -exec mv -f '{}' rumprun-${MACHINE_GNU_ARCH}/lib/rumprun-${PLATFORM}/ \;
                find lib -maxdepth 1 -name \*.a \
-                   -exec mv -f '{}' lib/rumprun-${MACHINE_GNU_ARCH}/ \;
+                   -exec mv -f '{}' rumprun-${MACHINE_GNU_ARCH}/lib/ \;
 
                # make sure special cases are visible everywhere
                for x in c pthread ; do
-                       rm -f lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/lib${x}.a
-                       ln -s ../rumprun-${MACHINE_GNU_ARCH}/lib${x}.a \
-                           lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}/lib${x}.a
+                       rm -f rumprun-${MACHINE_GNU_ARCH}/lib/rumprun-${PLATFORM}/lib${x}.a
+                       ln -s ../lib${x}.a \
+                           rumprun-${MACHINE_GNU_ARCH}/lib/rumprun-${PLATFORM}/lib${x}.a
                done
                find . -maxdepth 1 \! -path . \! -path ./include\* \
                    | xargs tar -cf -
@@ -448,7 +446,7 @@ doinstall ()
 
        # copy include to destdir/include/rumprun
        ( cd ${STAGING}/include ; tar -cf - . ) \
-           | ( cd ${RRDEST}/include/rumprun ; tar -xf - )
+           | ( cd ${RRDEST}/rumprun-${MACHINE_GNU_ARCH}/include ; tar -xf - )
 }
 
 #

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 85b6308dcf5612a68201615a17fa131b3b012b81..a96f376ba5deb8e6352813921fbd3c0fc51bdaf4 100644 (file)
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -27,8 +27,8 @@ LIBDIR:=      $(abspath ../../lib)
 
 COMMONDIR:=    $(abspath ../)
 
-INSTALLDIR_LIBARCH:=   ${INSTALLDIR}/lib/rumprun-${MACHINE_GNU_ARCH}
-INSTALLDIR_LIBPLAT:=   ${INSTALLDIR}/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}
+INSTALLDIR_LIBARCH:=   ${INSTALLDIR}/rumprun-${MACHINE_GNU_ARCH}/lib
+INSTALLDIR_LIBPLAT:=   ${INSTALLDIR}/rumprun-${MACHINE_GNU_ARCH}/lib/rumprun-${PLATFORM}
 
 define BUILDLIB_target
 .PHONY: $${RROBJLIB}/${1}/${1}.a
@@ -101,7 +101,7 @@ tests: ${MAINOBJ} commonlibs
 .PHONY: installkern
 installkern:
        install -m 0444 ${MAINOBJ} ${INSTALLDIR_LIBPLAT}
-       install -m 0444 ${LDSCRIPT} ${INSTALLDIR}/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM}.ldscript
+       install -m 0444 ${LDSCRIPT} ${INSTALLDIR}/rumprun-${MACHINE_GNU_ARCH}/lib/${PLATFORM}.ldscript
 
 .PHONY: installuser
 installuser:

diff --git a/tests/buildtests.sh b/tests/buildtests.sh
index 38d37fcd300d413cfb8ca35f1fd535f9044ae852..bfbf4e61aa444b447512d382cf5f6e23f49af6a0 100755 (executable)
--- a/tests/buildtests.sh
+++ b/tests/buildtests.sh
@@ -68,7 +68,7 @@ test_apptools()
                (
                        mkdir -p cmake/build
                        cd cmake/build
-                       cmake -DCMAKE_TOOLCHAIN_FILE=${RRDEST}/share/${TOOLTUPLE}-toolchain.cmake ..
+                       cmake -DCMAKE_TOOLCHAIN_FILE=${RRDEST}/rumprun-${MACHINE_GNU_ARCH}/share/${TOOLTUPLE}-toolchain.cmake ..
                        make
                )
        fi

diff --git a/tests/nolibc/Makefile b/tests/nolibc/Makefile
index 1a20197ccaa546f20106979babb1c0d18972ed97..f69d2fb08fec7d4f582797266da7aadbe2b1356f 100644 (file)
--- a/tests/nolibc/Makefile
+++ b/tests/nolibc/Makefile
@@ -3,10 +3,10 @@ include ${BUILDRUMP_TOOLFLAGS}
 
 CFLAGS+=       ${BUILDRUMP_TOOL_CFLAGS}
 
-LDFLAGS:= -L$(abspath ../../rumprun/lib/rumprun-${MACHINE_GNU_ARCH}-${PLATFORM})
+LDFLAGS:= -L$(abspath ../../rumprun/rumprun-${MACHINE_GNU_ARCH}/lib/rumprun-${PLATFORM})
 LDFLAGS+= -L${RROBJ}/lib/libcompiler_rt
 
-CPPFLAGS+= -I../../include -I../../rumprun/include/rumprun
+CPPFLAGS+= -I../../include -I../../rumprun/rumprun-${MACHINE_GNU_ARCH}/include
 CPPFLAGS+= -I../../platform/${PLATFORM}/include
 
 LDSCRIPT= ${RROBJ}/bmk.ldscript