diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 19:59:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 19:59:26 -0400 |
commit | d38b69689c349f35502b92e20dafb30c62d49d63 (patch) | |
tree | 3f996dd032b6ad9a6010cea76bf0908e5814e240 /scripts/Makefile.host | |
parent | eb99adde31b7d85c67a5e1c2fa5e098e1056dd79 (diff) |
Revert "kbuild: fix make -rR breakage"
This reverts commit e5c44fd88c146755da6941d047de4d97651404a9.
Thanks to Daniel Ritz and Michal Piotrowski for noticing the problem.
Daniel says:
"[The] reason is a recent change that made modules always shows as
module.mod. it breaks modprobe and probably many scripts..besides
lsmod looking horrible
stuff like this in modprobe.conf:
install pcmcia_core /sbin/modprobe --ignore-install pcmcia_core; /sbin/modprobe pcmcia
makes modprobe fork/exec endlessly calling itself...until oom
interrupts it"
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'scripts/Makefile.host')
-rw-r--r-- | scripts/Makefile.host | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 18ecd4d5df7f..2b066d12af2c 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host | |||
@@ -80,10 +80,8 @@ obj-dirs += $(host-objdirs) | |||
80 | ##### | 80 | ##### |
81 | # Handle options to gcc. Support building with separate output directory | 81 | # Handle options to gcc. Support building with separate output directory |
82 | 82 | ||
83 | _hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ | 83 | _hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS_$(*F).o) |
84 | $(HOSTCFLAGS_$(basetarget).o) | 84 | _hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) $(HOSTCXXFLAGS_$(*F).o) |
85 | _hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ | ||
86 | $(HOSTCXXFLAGS_$(basetarget).o) | ||
87 | 85 | ||
88 | ifeq ($(KBUILD_SRC),) | 86 | ifeq ($(KBUILD_SRC),) |
89 | __hostc_flags = $(_hostc_flags) | 87 | __hostc_flags = $(_hostc_flags) |