diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-08-17 14:27:07 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-08-17 14:27:07 +0400 |
| commit | 0856cfb8f19cb91ca522304a68b51501be384f04 (patch) | |
| tree | f6ae9bb96610dda5ab0a33d71197b5e4d8dc8ab1 | |
| parent | 19a7c6ba9e32e93ae62c126e1219c25f80612db2 (diff) | |
| download | illumos-fusefs-0856cfb8f19cb91ca522304a68b51501be384f04.tar.gz | |
| -rw-r--r-- | kernel/Makefile.com | 10 | ||||
| -rw-r--r-- | kernel/amd64/Makefile | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kernel/Makefile.com b/kernel/Makefile.com index 683d693..0a75e95 100644 --- a/kernel/Makefile.com +++ b/kernel/Makefile.com @@ -23,15 +23,15 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -INSTALL= /usr/sbin/install -CC = cc +INSTALL= /usr/bin/install +CC = gcc CTFMERGE = ctfmerge CTFCONVERT = ctfconvert LINT = lint CCFLAGS = $(CFLAGS) -g -O2 -D_KERNEL -D__SOLARIS__ LLINTFLAGS = -sxnuF -errtags -errsecurity=extended $(LINTFLAGS) -D_KERNEL -D__SOLARIS__ -LD = /usr/ccs/bin/ld +LD = /usr/bin/ld FUSE_MODULE=fuse @@ -57,8 +57,8 @@ lint: $(SRC) $(LINT) $(LLINTFLAGS) $(SRC) install_common: - $(INSTALL) -f $(ROOT)/usr/kernel/drv fuse - $(INSTALL) -f $(ROOT)/usr/kernel/drv ../fuse.conf + $(INSTALL) -t $(ROOT)/usr/kernel/drv fuse + $(INSTALL) -t $(ROOT)/usr/kernel/drv ../fuse.conf clean: rm -f $(OBJS) $(FUSE_MODULE) diff --git a/kernel/amd64/Makefile b/kernel/amd64/Makefile index 2915e9f..92439ec 100644 --- a/kernel/amd64/Makefile +++ b/kernel/amd64/Makefile @@ -23,7 +23,7 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. -CFLAGS=-xmodel=kernel -m64 +CFLAGS=-mcmodel=kernel -m64 LINTFLAGS = -m64 include ../Makefile.com @@ -31,4 +31,4 @@ DIRSAMD64 = $(ROOT)/usr/kernel/drv/amd64 install: mkdir -p $(DIRSAMD64) - $(INSTALL) -f $(ROOT)/usr/kernel/drv/amd64 fuse + $(INSTALL) -t $(ROOT)/usr/kernel/drv/amd64 fuse |