ehmry/genodepkgs
ehmry
/
genodepkgs
2
0
Fork 0
Code Releases Activity

Fix base-linux build, compile -O2

This commit is contained in:
Ehmry - 2019-10-07 23:37:43 +02:00
parent 3961ab76e6
commit 484d036057
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/driver-linux.nix
View File

@ -41,9 +41,9 @@ let
baseSetup = with testPkgs; '' baseSetup = with testPkgs; ''
file link -s core ${depot.base-linux}/bin/core file link -s core ${depot.base-linux}/bin/core
file link -s timer ${depot.base-linux}/bin/timer file link -s timer ${genode.base-linux}/bin/linux_timer_drv
file link -s ld.lib.so ${depot.base-linux}/lib/ld.lib.so file link -s ld.lib.so ${depot.base-linux}/lib/ld.lib.so
file link -s init ${depot.init}/bin/init file link -s init ${genode.os}/bin/init
file link -s config ${./driver-config.xml} file link -s config ${./driver-config.xml}
file link -s test.config $env(testConfig) file link -s test.config $env(testConfig)
''; '';

10
upstream/default.nix
View File

@ -53,8 +53,10 @@ let
LIBCXX = llvmPackages.libcxx; LIBCXX = llvmPackages.libcxx;
LIBCXXABI = llvmPackages.libcxxabi; LIBCXXABI = llvmPackages.libcxxabi;
LIBUNWIND = llvmPackages.libunwind; LIBUNWIND = llvmPackages.libunwind;
LIBUNWIND_BAREMETAL = llvmPackages.libunwind.override { isBaremetal = true; }; LIBUNWIND_BAREMETAL =
llvmPackages.libunwind.override { isBaremetal = true; };
LINUX_HEADERS = buildPackages.glibc.dev; LINUX_HEADERS = buildPackages.glibc.dev;
OLEVEL = "-O2";
TUP_ARCH = tupArch; TUP_ARCH = tupArch;
VERSION = version; VERSION = version;
}; };
@ -92,7 +94,8 @@ let
installPhase = '' installPhase = ''
# Populate the "dev" headers # Populate the "dev" headers
for DIR in repos/$repo/include; do if [ -d "repos/$repo/include" ]; then
for DIR in repos/$repo/include; do
for SPEC in $specs; do for SPEC in $specs; do
if [ -d $DIR/spec/$SPEC ]; then if [ -d $DIR/spec/$SPEC ]; then
cp -r $DIR/spec/$SPEC/* $dev/include cp -r $DIR/spec/$SPEC/* $dev/include
@ -101,7 +104,8 @@ let
done done
rm -rf $DIR/spec rm -rf $DIR/spec
cp -r $DIR $dev/ cp -r $DIR $dev/
done done
fi
touch $dev/.genode touch $dev/.genode
for pc in $dev/lib/pkgconfig/*.pc; do for pc in $dev/lib/pkgconfig/*.pc; do