2
0
Fork 0

Fix base-linux build, compile -O2

20.02
Emery Hemingway 3 years ago
parent 3961ab76e6
commit 484d036057
  1. 4
      tests/driver-linux.nix
  2. 10
      upstream/default.nix

@ -41,9 +41,9 @@ let
baseSetup = with testPkgs; ''
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 init ${depot.init}/bin/init
file link -s init ${genode.os}/bin/init
file link -s config ${./driver-config.xml}
file link -s test.config $env(testConfig)
'';

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

Loading…
Cancel
Save