Print this page
7438 intermittent build failures from the new boot loader
Reviewed by: Juraj Lutter <juraj.lutter@erigones.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/boot/sys/boot/i386/Makefile
+++ new/usr/src/boot/sys/boot/i386/Makefile
1 1 #
2 2 # This file and its contents are supplied under the terms of the
3 3 # Common Development and Distribution License ("CDDL"), version 1.0.
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
4 4 # You may only use this file in accordance with the terms of version
5 5 # 1.0 of the CDDL.
6 6 #
7 7 # A full copy of the text of the CDDL should have accompanied this
8 8 # source. A copy of the CDDL is also available via the Internet at
9 9 # http://www.illumos.org/license/CDDL.
10 10 #
11 11
12 12 #
13 13 # Copyright 2015 Toomas Soome <tsoome@me.com>
14 +# Copyright 2016 RackTop Systems.
14 15 #
15 16
16 17 include $(SRC)/Makefile.master
17 18
18 19
19 20 # likely targets for removal, keeping around just in case...
20 21 # SUBDIRS= boot0 boot0sio kgzldr libfirewire
21 22 # current targets
22 23 SUBDIRS= pmbr btx cdboot gptzfsboot libi386 loader pxeldr
23 -INSTDIRS= pmbr cdboot gptzfsboot loader pxeldr
24 +
25 +# these subdirs depend on crt0.o which is built in the btx
26 +# subdir.
27 +CRTDIRS= gptzfsboot loader
24 28
25 29 all:= TARGET= all
26 30 install:= TARGET= install
27 31 clean:= TARGET= clean
28 32 clobber:= TARGET= clobber
29 33
30 34 .KEEP_STATE:
31 35
32 36 all clean clobber: $(SUBDIRS)
33 37
34 -install: all $(INSTDIRS)
38 +$(CRTDIRS): btx
39 +
40 +install: $(SUBDIRS)
35 41
36 42 FRC:
37 43
38 44 $(SUBDIRS): FRC
39 45 @cd $@; pwd; $(MAKE) $(TARGET)
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX