Skip to content

L
linux
Commit 9abb0c54 authored by Kai Germaschewski's avatar Kai Germaschewski
Browse files
Options

Makefile: fix merge

parent 3e12a6dc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Makefile
View file @ 9abb0c54
...@@ -181,7 +181,7 @@ vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o ini ...@@ -181,7 +181,7 @@ vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o ini
linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS)) linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER $(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER
$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@) $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)
# Configuration # Configuration
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -473,7 +473,7 @@ tags: dummy ...@@ -473,7 +473,7 @@ tags: dummy
# FIXME: anybody still using this? # FIXME: anybody still using this?
fs lib mm ipc kernel drivers net sound: dummy fs lib mm ipc kernel drivers net sound: dummy
$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" $(subst $@, _dir_$@, $@) $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
# Make a backup # Make a backup
# FIXME anybody still using this? # FIXME anybody still using this?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7