Print this page
7192 Remove SPARC-only ONLY64 option
*** 22,34 ****
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2011, Richard Lowe
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2012, Igor Kozhukhov <ikozhukhov@gmail.com>
# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
- # Copyright (c) 2013 RackTop Systems.
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2014 Nexenta Systems, Inc. All rights reserved.
#
#
# It is easier to think in terms of directory names without the ROOT macro
# prefix. ROOTDIRS is TARGETDIRS with ROOT prefixes. It is necessary
--- 22,34 ----
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2011, Richard Lowe
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2012, Igor Kozhukhov <ikozhukhov@gmail.com>
# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2014 Nexenta Systems, Inc. All rights reserved.
+ # Copyright 2016 RackTop Systems.
#
#
# It is easier to think in terms of directory names without the ROOT macro
# prefix. ROOTDIRS is TARGETDIRS with ROOT prefixes. It is necessary
*** 39,49 ****
$(BUILD64) DIRLINKS += $(SYM.DIRS64)
FILELINKS= $(SYM.USRCCSLIB) $(SYM.USRLIB)
$(BUILD64) FILELINKS += $(SYM.USRCCSLIB64) $(SYM.USRLIB64)
! TARGETDIRS= $(DIRS)
$(BUILD64) TARGETDIRS += $(DIRS64)
TARGETDIRS += $(FILELINKS) $(DIRLINKS)
i386_DIRS= \
--- 39,49 ----
$(BUILD64) DIRLINKS += $(SYM.DIRS64)
FILELINKS= $(SYM.USRCCSLIB) $(SYM.USRLIB)
$(BUILD64) FILELINKS += $(SYM.USRCCSLIB64) $(SYM.USRLIB64)
! TARGETDIRS= $(DIRS) $(DIRS32)
$(BUILD64) TARGETDIRS += $(DIRS64)
TARGETDIRS += $(FILELINKS) $(DIRLINKS)
i386_DIRS= \
*** 57,71 ****
/usr/lib/xen/bin
sparc_DIRS= \
/usr/lib/ldoms
- sparc_64ONLY= $(POUND_SIGN)
- 64ONLY= $($(MACH)_64ONLY)
-
- $(64ONLY) MACH32_DIRS=/usr/ucb/$(MACH32)
-
DIRS= \
/boot \
/boot/solaris \
/boot/solaris/bin \
$($(MACH)_DIRS) \
--- 57,66 ----
*** 213,223 ****
/usr \
/usr/4lib \
/usr/ast \
/usr/ast/bin \
/usr/bin \
- /usr/bin/$(MACH32) \
/usr/ccs \
/usr/ccs/bin \
/usr/ccs/lib \
/usr/demo \
/usr/demo/SOUND \
--- 208,217 ----
*** 269,279 ****
/usr/lib/fs/zfs \
/usr/lib/gss \
/usr/lib/hal \
/usr/lib/inet \
/usr/lib/inet/ilb \
- /usr/lib/inet/$(MACH32) \
/usr/lib/inet/wanboot \
/usr/lib/krb5 \
/usr/lib/link_audit \
/usr/lib/lwp \
/usr/lib/mdb \
--- 263,272 ----
*** 288,298 ****
/usr/lib/python2.6/vendor-packages/64 \
/usr/lib/python2.6/vendor-packages/solaris \
/usr/lib/python2.6/vendor-packages/zfs \
/usr/lib/python2.6/vendor-packages/beadm \
/usr/lib/rcap \
- /usr/lib/rcap/$(MACH32) \
/usr/lib/sa \
/usr/lib/saf \
/usr/lib/sasl \
/usr/lib/scsi \
/usr/lib/secure \
--- 281,290 ----
*** 308,318 ****
/usr/sadm \
/usr/sadm/install \
/usr/sadm/install/bin \
/usr/sadm/install/scripts \
/usr/sbin \
- /usr/sbin/$(MACH32) \
/usr/share \
/usr/share/applications \
/usr/share/audio \
/usr/share/audio/samples \
/usr/share/audio/samples/au \
--- 300,309 ----
*** 328,338 ****
/usr/share/man \
/usr/share/src \
/usr/snadm \
/usr/snadm/lib \
/usr/ucb \
- $(MACH32_DIRS) \
/usr/ucblib \
/usr/xpg4 \
/usr/xpg4/bin \
/usr/xpg4/include \
/usr/xpg4/lib \
--- 319,328 ----
*** 417,426 ****
--- 407,426 ----
/var/uucp \
/var/tmp \
/var/tsol \
/var/tsol/doors
+ i386_DIRS32= \
+ /usr/ucb/$(MACH32)
+
+ DIRS32= \
+ $((MACH)_DIRS32) \
+ /usr/bin/$(MACH32) \
+ /usr/lib/inet/$(MACH32) \
+ /usr/lib/rcap/$(MACH32) \
+ /usr/sbin/$(MACH32)
+
sparcv9_DIRS64= \
/platform/sun4u \
/platform/sun4u/lib \
/platform/sun4u/lib/$(MACH64) \
/usr/platform/sun4u \