Re: scsi compiling/linking problem w/ 2.1.75

Michael Elizabeth Chastain (mec@shout.net)
Wed, 24 Dec 1997 16:41:28 -0600


Hello Kernel Hackers,

An anonymous person writes:
> it would appear that 2.1.75 won't link in scsi support unless modules
> have been selected (they don't have to be used however!)

Here's a patch. It works for me. Let me know if it works for you,
and then I'll send it to Linus Torvalds.

<ftp://ftp.shout.net/pub/users/mec/patch/scsi-make.2176>

Michael Chastain
<mailto:mec@shout.net>
"love without fear"

===

diff -u -r -N linux-2.1.76/drivers/scsi/Makefile linux/drivers/scsi/Makefile
--- linux-2.1.76/drivers/scsi/Makefile Mon Dec 22 01:04:48 1997
+++ linux/drivers/scsi/Makefile Wed Dec 24 17:06:54 1997
@@ -1,4 +1,3 @@
-
# Makefile for linux/drivers/scsi
#
# Note! Dependencies are done automagically by 'make dep', which also
@@ -34,14 +33,13 @@
ifeq ($(CONFIG_SCSI),y)
# We must attach scsi_syms.o to scsi.o, as otherwise there is nothing to
# pull the object file from the archive.
- SCSI=scsi.o
+ O_TARGET := scsi_n_syms.o
+ O_OBJS := scsi.o
ifeq ($(CONFIG_MODULES),y)
- O_TARGET := scsi_n_syms.o
- O_OBJS := scsi.o scsi_error.o scsi_obsolete.o scsi_queue.o
OX_OBJS := scsi_syms.o
- SCSI := $(O_TARGET)
endif
- L_OBJS += $(SCSI) hosts.o scsi_ioctl.o constants.o scsicam.o
+ L_OBJS += scsi_n_syms.o hosts.o scsi_ioctl.o constants.o scsicam.o
+ L_OBJS += scsi_error.o scsi_obsolete.o scsi_queue.o
ifeq ($(CONFIG_PROC_FS),y)
L_OBJS += scsi_proc.o
endif