summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 1 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index a4e961a..fd6e82e 100644
--- a/Makefile
+++ b/Makefile
@@ -46,11 +46,9 @@ OBJS_KCSAN += \
$K/kcsan.o
endif
-ifeq ($(LAB),$(filter $(LAB), lock))
OBJS += \
$K/stats.o\
$K/sprintf.o
-endif
OBJS += \
@@ -90,7 +88,7 @@ CFLAGS = -Wall -Werror -O -fno-omit-frame-pointer -ggdb -gdwarf-2
ifdef LAB
LABUPPER = $(shell echo $(LAB) | tr a-z A-Z)
-XCFLAGS += -DSOL_$(LABUPPER) -DLAB_$(LABUPPER) -DLAB_PGTBL -DLAB_NET
+XCFLAGS += -DSOL_$(LABUPPER) -DLAB_$(LABUPPER) -DLAB_PGTBL -DLAB_NET -DLAB_LOCK
endif
CFLAGS += $(XCFLAGS)
@@ -139,9 +137,7 @@ tags: $(OBJS) _init
ULIB = $U/ulib.o $U/usys.o $U/printf.o $U/umalloc.o
-ifeq ($(LAB),$(filter $(LAB), lock))
ULIB += $U/statistics.o
-endif
_%: %.o $(ULIB)
$(LD) $(LDFLAGS) -T $U/user.ld -o $@ $^
@@ -197,10 +193,8 @@ UPROGS=\
-ifeq ($(LAB),$(filter $(LAB), lock))
UPROGS += \
$U/_stats
-endif
UPROGS += \
$U/_call\
@@ -236,11 +230,9 @@ endif
UPROGS += \
$U/_pgtbltest
-ifeq ($(LAB),lock)
UPROGS += \
$U/_kalloctest\
$U/_bcachetest
-endif
ifeq ($(LAB),fs)
UPROGS += \