summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>1999-02-03 01:17:11 +0000
committerHerb Lewis <herb@samba.org>1999-02-03 01:17:11 +0000
commit4d1d17c51b1447a8e91daf2a6482bfc3d79fddca (patch)
tree9ea8dbc9670d2ccf5e058cdcda059a9980e1db3e
parent95f5b9724e1e4b5e2fe3a8e2ffee8a697aec5d25 (diff)
downloadsamba-4d1d17c51b1447a8e91daf2a6482bfc3d79fddca.tar.gz
samba-4d1d17c51b1447a8e91daf2a6482bfc3d79fddca.tar.xz
samba-4d1d17c51b1447a8e91daf2a6482bfc3d79fddca.zip
allow specifying different instriction set arch. for regular and -32
builds (needed for IRIX to build smbsh on mips4 ISA machines)
-rw-r--r--source/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/Makefile.in b/source/Makefile.in
index 03da99a565c..efa170e26f0 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -73,7 +73,8 @@ FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"
FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
-FLAGS = $(FLAGS5) $(PASSWD_FLAGS)
+FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
+FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS)
SPROGS = bin/smbd bin/nmbd bin/swat
PROGS1 = bin/smbclient bin/testparm bin/testprns bin/smbrun bin/smbstatus
@@ -270,6 +271,7 @@ debug2html : CHECK bin/debug2html
CHECK:
@echo "Using FLAGS = $(FLAGS)"
+ @echo "Using FLAGS32 = $(FLAGS32)"
@echo "Using LIBS = $(LIBS)"
MAKEDIR = || exec false; \
@@ -320,7 +322,7 @@ MAKEDIR = || exec false; \
@MAINT@ else dir=.deps/`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` \
@MAINT@ $(MAKEDIR); fi; rm -f .deps/$@ .deps/$@d
@echo Compiling $*.c with @PICFLAG@ and -32
- @$(CC) -32 -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< \
+ @$(CC) -32 -I. -I$(srcdir) $(FLAGS32) @PICFLAG@ -c $< \
-o $*.po32.o @MAINT@ -Wp,-MD,.deps/$@
@BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po32$$%.o%'` $@.o
@MAINT@ @sed 's|^'`echo $*.po32.o | sed 's,.*/,,'`':|$@:|' \