dad8ff7 HBSD: Resolve merge conflicts — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

HBSD: Resolve merge conflicts

Shawn Webb committed 6 days ago

commit dad8ff75e1a9bcf99a75bde35993c5a18a427c77
parent 920c183

2 files changed +2 -6

modified mk/lib.mk

@@ -1,10 +1,8 @@

 include $(MK)/common.mk
 <<<<<<< HEAD
 LOCAL_CFLAGS+=	-fPIC -flto
 =======
 CLEAN_FILES+=	lib$(LIB).a lib$(LIB)$(SH_SOEXT) lib$(LIB)$(LIBSOEXT) $(OBJS) $(SHOBJS) $(DEPFILES)
 >>>>>>> upstream/main
 all: lib$(LIB)$(LIBSOEXT) lib$(LIB)$(SH_SOEXT) lib$(LIB).a

modified mk/static-lib.mk

@@ -1,10 +1,8 @@

 include $(MK)/common.mk
 <<<<<<< HEAD
 LOCAL_CFLAGS+=	-fPIC -flto
 =======
 CLEAN_FILES+=	lib$(LIB).a lib$(LIB)_pic.a $(OBJS) $(SHOBJS) $(DEPFILES)
 >>>>>>> upstream/main
 all: lib$(LIB).a lib$(LIB)_pic.a