Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Jul 2012 12:04:50 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r238096 - user/ae/bootcode/sys/boot/common
Message-ID:  <201207041204.q64C4oNT009253@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ae
Date: Wed Jul  4 12:04:50 2012
New Revision: 238096
URL: http://svn.freebsd.org/changeset/base/238096

Log:
  Don't build disk.c and part.c if LOADER_DISK_SUPPORT is "no" or
  LOADER_NO_DISK_SUPPORT is set. Some loaders might work without disks
  support, so we don't need these files.

Modified:
  user/ae/bootcode/sys/boot/common/Makefile.inc

Modified: user/ae/bootcode/sys/boot/common/Makefile.inc
==============================================================================
--- user/ae/bootcode/sys/boot/common/Makefile.inc	Wed Jul  4 10:17:02 2012	(r238095)
+++ user/ae/bootcode/sys/boot/common/Makefile.inc	Wed Jul  4 12:04:50 2012	(r238096)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-SRCS+=	boot.c commands.c console.c devopen.c disk.c interp.c 
+SRCS+=	boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c ls.c misc.c 
-SRCS+=	module.c panic.c part.c
+SRCS+=	module.c panic.c
 
 .if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
@@ -24,8 +24,17 @@ SRCS+=	load_elf64.c reloc_elf64.c
 SRCS+=	dev_net.c
 .endif
 
+.if !defined(LOADER_NO_DISK_SUPPORT) ||
+    (defined(LOADER_DISK_SUPPORT) && ${LOADER_DISK_SUPPORT} != "no")
+SRCS+=	disk.c part.c
+CFLAGS+= -DLOADER_DISK_SUPPORT
 .if !defined(LOADER_NO_GPT_SUPPORT)
 SRCS+=	crc32.c
+CFLAGS+= -DLOADER_GPT_SUPPORT
+.endif
+.if !defined(LOADER_NO_MBR_SUPPORT)
+CFLAGS+= -DLOADER_MBR_SUPPORT
+.endif
 .endif
 
 .if defined(HAVE_BCACHE)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207041204.q64C4oNT009253>