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/efi/libefi/Makefile
+++ new/usr/src/boot/sys/boot/efi/libefi/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 CC= $(GCC_ROOT)/bin/gcc
19 20
20 21 LIB= efi
21 22
22 -all: machine x86 lib$(LIB).a
23 +all: lib$(LIB).a
24 +
25 +lib$(LIB).a: machine x86
26 +
23 27 install:
24 28
25 29 SRCS= delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
26 30 libefi.c time.c
27 31
28 32 OBJS= $(SRCS:%.c=%.o)
29 33
30 34 CPPFLAGS= -DTERM_EMU
31 35 CFLAGS = -O2
32 36
33 37 #.if ${MACHINE_CPUARCH} == "aarch64"
34 38 #CFLAGS+= -msoft-float -mgeneral-regs-only
35 39 #.endif
36 40 #.if ${MACHINE_ARCH} == "amd64"
37 41 CFLAGS += -fPIC
38 42 #.endif
39 43
40 44 CFLAGS += -nostdinc -I. -I../../../../include -I../../..
41 45 CFLAGS += -I../include
42 46 CFLAGS += -I../include/${MACH64}
43 47 CFLAGS += -I../../../../lib/libstand
44 48
45 49 # Pick up the bootstrap header for some interface items
46 50 CFLAGS += -I../../common
47 51
48 52 # Handle FreeBSD specific %b and %D printf format specifiers
49 53 # CFLAGS+= ${FORMAT_EXTENSIONS}
50 54 # CFLAGS += -D__printf__=__freebsd_kprintf__
51 55 CFLAGS+= -DTERM_EMU
52 56
53 57 include ../Makefile.inc
54 58
55 59 lib$(LIB).a: $(SRCS) $(OBJS)
56 60 $(AR) $(ARFLAGS) $@ $(OBJS)
57 61
58 62 clean: clobber
59 63 clobber:
60 64 $(RM) $(CLEANFILES) $(OBJS) machine x86 lib$(LIB).a
61 65
62 66 machine:
63 67 $(RM) machine
64 68 $(SYMLINK) ../../../amd64/include machine
65 69
66 70 x86:
67 71 $(RM) x86
68 72 $(SYMLINK) ../../../x86/include x86
↓ open down ↓ |
36 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX