diff options
| author | Bryan Cantrill <bryan@joyent.com> | 2019-02-04 21:36:58 +0000 |
|---|---|---|
| committer | Bryan Cantrill <bryan@joyent.com> | 2019-02-05 19:27:05 +0000 |
| commit | 5b248548c9ca0108aa36e7e3db7fbc46077bcf4b (patch) | |
| tree | cf4223478c2d282368ed0ce152cc002b882f20c0 /usr/src/tools/smatch | |
| parent | fc7d1728f1b98070dfbbebfbb53b62279b33cfe2 (diff) | |
| download | illumos-joyent-5b248548c9ca0108aa36e7e3db7fbc46077bcf4b.tar.gz | |
OS-7498 __ctype_mask[EOF] has been working by accident
OS-7511 undefined behavior in lx_cap_update_priv() turns gcc7 demonic
OS-7517 -faggressive-loop-optimizations is too aggressive
OS-7518 array over-read in has_saved_fp()
OS-7535 allow platform builds on base-64 image
OS-7536 stop shipping poold(1M) and its cohorts
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/tools/smatch')
| -rw-r--r-- | usr/src/tools/smatch/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/usr/src/tools/smatch/Makefile b/usr/src/tools/smatch/Makefile index 7c18c6ce72..b876b8bb36 100644 --- a/usr/src/tools/smatch/Makefile +++ b/usr/src/tools/smatch/Makefile @@ -28,7 +28,11 @@ include ../Makefile.tools i386_CC = $(GNUC_ROOT)/bin/gcc sparc_CC = $(GNUC_ROOT)/bin/gcc -CFLAGS = -O -D__sun -Wall -Wno-unknown-pragmas -std=gnu99 -nodefaultlibs +# +# Note that we always build smatch 64-bit, assuring that we get the same binary +# regardless of the image of the build machine. +# +CFLAGS = -O -m64 -D__sun -Wall -Wno-unknown-pragmas -std=gnu99 -nodefaultlibs SMATCHDATADIR = $(ROOTONBLDSHARE)/smatch @@ -38,7 +42,15 @@ CFLAGS += -DMULTIARCH_TRIPLET=NULL LDLIBS += -lsqlite3 -lcrypto -lm -lgcc -lc LDFLAGS = $(MAPFILE.NES:%=-Wl,-M%) + +# +# To allow linking to $(NATIVE_ADJUNCT) libraries on both multiarch (where +# 64-bit libraries will be found in $(NATIVE_ADJUNCT)/lib/$(MACH64)) and 64-bit +# images (where 64-bit libraries will be found in $(NATIVE_ADJUNCT)/lib/), we +# set our library and run paths to both locations. +# LDFLAGS += -L$(NATIVE_ADJUNCT)/lib -R$(NATIVE_ADJUNCT)/lib +LDFLAGS += -L$(NATIVE_ADJUNCT)/lib/$(MACH64) -R$(NATIVE_ADJUNCT)/lib/$(MACH64) CPPFLAGS += -nostdinc CPPFLAGS += -Isrc/ |