From c776c35a04752f239b4eaa26fb55d5d2538ecaad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 10 Jan 2005 01:32:11 +0000 Subject: [PATCH] Added a temporary way to differentiate between kernel and userland builds for parts of kernel_os_main.o. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10628 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/libroot/Jamfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kernel/libroot/Jamfile b/src/kernel/libroot/Jamfile index 87b178020b..10b58e02cb 100755 --- a/src/kernel/libroot/Jamfile +++ b/src/kernel/libroot/Jamfile @@ -9,9 +9,13 @@ KernelObjects # kernel libroot os files +# until the build system is fixed (and no longer uses kernel build rules +# for libroot.so), the KERNEL_OS_MAIN is needed to differentiate between +# kernel and userland builds here + KernelMergeObject kernel_os_main.o : driver_settings.c - : -fno-pic + : -fno-pic -DKERNEL_OS_MAIN ; SEARCH on [ FGristFiles