diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-07 13:06:23 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-07 13:06:23 +0000 |
| commit | 86e0843397e5f5b2c5689563c14efc626a2d7ed4 (patch) | |
| tree | 9ba4f862a58ea9da2cd096f86fa72d80757f1079 /usr/src/ucblib | |
| parent | 9452abceb6be5f4e936e05d2d09cf42d4b85256b (diff) | |
| parent | 02123a497a63fe1acfaf63446b5b19101fa6c347 (diff) | |
| download | illumos-joyent-86e0843397e5f5b2c5689563c14efc626a2d7ed4.tar.gz | |
[illumos-gate merge]
commit 02123a497a63fe1acfaf63446b5b19101fa6c347
12141 libbe cannot handle vfstab updates in NGZ
commit 58e78d166bd2b5a9dda31250b8e8bad7c7548c0e
12149 mixed up 32 and 64 bit build
commit f7d2fd30ef2e2b3d5779d5b0ad885081307a4512
12148 libc: _rtbootld.o needs to be built with -m32
commit bfb9edc9bd178b0ce7fa2fbe1fc66e18e316af4e
12143 scan code should check the return value of zfs_btree_first
commit da9bf00574dd2845efcb9b791f4b44ecf1d1548c
12078 loader: rewrite zfs vdev initialization
Diffstat (limited to 'usr/src/ucblib')
| -rw-r--r-- | usr/src/ucblib/libcurses/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/ucblib/libdbm/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/ucblib/librpcsoc/i386/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/ucblib/libtermcap/i386/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/ucblib/libcurses/i386/Makefile b/usr/src/ucblib/libcurses/i386/Makefile index 75f501557f..aa983b2923 100644 --- a/usr/src/ucblib/libcurses/i386/Makefile +++ b/usr/src/ucblib/libcurses/i386/Makefile @@ -26,7 +26,7 @@ include ../Makefile.com DYNFLAGS += $(DYNFLAGS32) -BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) +BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) .KEEP_STATE: diff --git a/usr/src/ucblib/libdbm/i386/Makefile b/usr/src/ucblib/libdbm/i386/Makefile index 85705049e2..2d7d1fdc53 100644 --- a/usr/src/ucblib/libdbm/i386/Makefile +++ b/usr/src/ucblib/libdbm/i386/Makefile @@ -25,7 +25,7 @@ include ../Makefile.com -BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) +BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) .KEEP_STATE: diff --git a/usr/src/ucblib/librpcsoc/i386/Makefile b/usr/src/ucblib/librpcsoc/i386/Makefile index 8c2e44b15a..adaefd83fb 100644 --- a/usr/src/ucblib/librpcsoc/i386/Makefile +++ b/usr/src/ucblib/librpcsoc/i386/Makefile @@ -26,7 +26,7 @@ include ../Makefile.com DYNFLAGS += $(DYNFLAGS32) -BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) +BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) LIBS = $(DYNLIB) diff --git a/usr/src/ucblib/libtermcap/i386/Makefile b/usr/src/ucblib/libtermcap/i386/Makefile index 85705049e2..2d7d1fdc53 100644 --- a/usr/src/ucblib/libtermcap/i386/Makefile +++ b/usr/src/ucblib/libtermcap/i386/Makefile @@ -25,7 +25,7 @@ include ../Makefile.com -BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) +BUILD.SO= $(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS) .KEEP_STATE: |