Print this page
NEX-5200 native tools must reliably use a native adjunct
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
NEX-4081 Upstream changes from illumos 5916 make libsqlite a real shared lib
Reviewed by: Alex Eremin <a.eremin@nexenta.com>
re #13879 make libsqlite a real shared lib
        
*** 79,89 ****
  $(NATIVE_BUILD)LD =     $(NATIVELD)
  $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
  $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
  $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
  $(NATIVE_BUILD)LDFLAGS =
! $(NATIVE_BUILD)LDLIBS = -L$(ADJUNCT_PROTO)/usr/lib -R$(ADJUNCT_PROTO)/usr/lib \
                          -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS)
  
  DIRMODE = 0755
  FILEMODE = 0555
  
--- 79,90 ----
  $(NATIVE_BUILD)LD =     $(NATIVELD)
  $(NATIVE_BUILD)CFLAGS = $(NATIVE_CFLAGS)
  $(NATIVE_BUILD)CPPFLAGS = $(MYCPPFLAGS) -I$(LIBUUTIL)/common -I$(LIBSCF)/inc
  $(NATIVE_BUILD)CPPFLAGS += -DNATIVE_BUILD
  $(NATIVE_BUILD)LDFLAGS =
! $(NATIVE_BUILD)LDLIBS = -L$(NATIVE_ADJUNCT)/usr/lib \
!                         -R$(NATIVE_ADJUNCT)/usr/lib \
                          -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native $(MYLDLIBS)
  
  DIRMODE = 0755
  FILEMODE = 0555