diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-28 11:59:49 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-28 11:59:49 +0000 |
commit | 57b471aeb372d625bad5f7340300b0d5f2d7d7f7 (patch) | |
tree | d57b4de23bf2128e9b131546bdf7d6b9e82a50fa /usr/src/grub | |
parent | b55712a7295a33023eab23147df4d72b5c128fe1 (diff) | |
parent | 8a702e5580b812176cb498d7b89713e44435866a (diff) | |
download | illumos-joyent-57b471aeb372d625bad5f7340300b0d5f2d7d7f7.tar.gz |
[illumos-gate merge]
commit 8a702e5580b812176cb498d7b89713e44435866a
9763 zfs(1M): broken formatting in allow/unallow description
commit d1855c8182d5cf1cd290336767a7c8e7537c13a2
9769 SMB domain logon fails with I18N user name
9774 libmlrpc changes in 1575 missed some things
commit 5255b2c28ca5f82d05860cbfd284950e01aa76f7
711 smb_rename has its bitwise ops muddled
commit 7ed546340881b42865171ddfa1a6167b289faae3
9684 Transform GCC_ROOT->GNUC_ROOT
Diffstat (limited to 'usr/src/grub')
-rw-r--r-- | usr/src/grub/grub-0.97/Makefile.solaris.defs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/grub/grub-0.97/Makefile.solaris.defs b/usr/src/grub/grub-0.97/Makefile.solaris.defs index a7e68a5239..faf41925c6 100644 --- a/usr/src/grub/grub-0.97/Makefile.solaris.defs +++ b/usr/src/grub/grub-0.97/Makefile.solaris.defs @@ -43,11 +43,11 @@ OPTION_DOCS = $(POUND_SIGN) OPTION_FS = $(POUND_SIGN) -BASE_CFLAGS = -B$(GCC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS) -std=gnu89 -BASE_CCASFLAGS = -B$(GCC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS) +BASE_CFLAGS = -B$(GNUC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS) -std=gnu89 +BASE_CCASFLAGS = -B$(GNUC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS) BASE_LDFLAGS = -CC = $(GCC_ROOT)/bin/gcc +CC = $(GNUC_ROOT)/bin/gcc CFLAGS = $(BASE_CFLAGS) CCDEPMODE = depmode=none |