diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-06 22:29:26 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-02-06 22:29:26 +0000 |
| commit | 2629cc82ee1e239547b58417ba97fc7e8d7543b7 (patch) | |
| tree | 18b980a7381c905ce45a6d47f4ee362a6b8ce628 | |
| parent | 87ac38635bca3ad78b33c32c180ddd98902428fd (diff) | |
| download | illumos-joyent-2629cc82ee1e239547b58417ba97fc7e8d7543b7.tar.gz | |
12217 add ld assert-deflib and guidance to gate build [fix duplicate makefile definitions from our local modifications]
| -rw-r--r-- | usr/src/lib/libc/Makefile.targ | 5 | ||||
| -rw-r--r-- | usr/src/lib/libc/amd64/Makefile | 11 | ||||
| -rw-r--r-- | usr/src/lib/libc/i386/Makefile.com | 12 |
3 files changed, 4 insertions, 24 deletions
diff --git a/usr/src/lib/libc/Makefile.targ b/usr/src/lib/libc/Makefile.targ index c69897fb79..9b2d6d35bd 100644 --- a/usr/src/lib/libc/Makefile.targ +++ b/usr/src/lib/libc/Makefile.targ @@ -320,6 +320,8 @@ pics/%.o: $(LIBCBASE)/../port/threads/%.d $(THREADSOBJS:%=pics/%) # assym rules +LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) + # # genassym is a funny fish: it's run on the build machine, so should use the # native compilers, but its job is to reflect the proto area header definitions, @@ -327,7 +329,8 @@ pics/%.o: $(LIBCBASE)/../port/threads/%.d $(THREADSOBJS:%=pics/%) # those headers. # genassym: $(GENASSYM_C) - $(NATIVECC) $(NATIVE_CFLAGS) $(CPPFLAGS) -o $@ $(GENASSYM_C) + $(NATIVECC) $(NATIVE_CFLAGS) $(CPPFLAGS) $(LDFLAGS.native) \ + -o $@ $(GENASSYM_C) # shared between 32- and 64-bit OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile index b532a126bf..dfd4069e85 100644 --- a/usr/src/lib/libc/amd64/Makefile +++ b/usr/src/lib/libc/amd64/Makefile @@ -1225,17 +1225,6 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h # assym.h build rules GENASSYM_C = genassym.c -LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) - -genassym: $(GENASSYM_C) - $(NATIVECC) $(NATIVE_CFLAGS) -Iinc -I$(LIBCDIR)/inc $(CPPFLAGS.native) \ - $(LDFLAGS.native) -o $@ $(GENASSYM_C) - -OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in - -assym.h: $(OFFSETS) genassym - $(OFFSETS_CREATE) <$(OFFSETS) >$@ - ./genassym >>$@ # derived C source and related explicit dependencies $(LIBCDIR)/port/gen/errlst.c + \ diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com index 3eaa08f3ce..9987e2ee87 100644 --- a/usr/src/lib/libc/i386/Makefile.com +++ b/usr/src/lib/libc/i386/Makefile.com @@ -1302,18 +1302,6 @@ $(ASSYMDEP_OBJS:%=pics/%) := CPPFLAGS += -I. $(ASSYMDEP_OBJS:%=pics/%): assym.h GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c -LDFLAGS.native = $(LDASSERTS) $(ZASSERTDEFLIB)=libc.so $(BDIRECT) - -genassym: $(GENASSYM_C) - $(NATIVECC) $(NATIVE_CFLAGS) -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc \ - -D__EXTENSIONS__ $(CPPFLAGS.native) $(LDFLAGS.native) \ - -o $@ $(GENASSYM_C) - -OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in - -assym.h: $(OFFSETS) genassym - $(OFFSETS_CREATE) <$(OFFSETS) >$@ - ./genassym >>$@ # derived C source and related explicit dependencies $(LIBCDIR)/port/gen/errlst.c + \ |