Page MenuHomeFreeBSD

D31044.id91775.diff
No OneTemporary

D31044.id91775.diff

Index: rescue/rescue/Makefile
===================================================================
--- rescue/rescue/Makefile
+++ rescue/rescue/Makefile
@@ -6,7 +6,12 @@
PACKAGE=rescue
MAN=
MK_SSP= no
+# Static-PIE is not supported so we should not be linking against _pie.a libs.
+# This is also needed to avoid linking against sanitizer-instrumented libraries
+# since MK_ASAN/MK_UBSAN will instrument the .pieo object files.
+MK_PIE= no
NO_SHARED= yes
+CRUNCH_BUILDOPTS+= MK_PIE=no NO_SHARED=yes
PROG= rescue
BINDIR?=/rescue
@@ -109,7 +114,7 @@
.if ${MK_IPFILTER} != "no"
CRUNCH_PROGS_sbin+= ipf
-CRUNCH_LIBS_ipf+= ${LIBIPF}
+CRUNCH_LIBS_ipf+= ${OBJTOP}/sbin/ipf/libipf/libipf.a
.endif
.if ${MK_ROUTED} != "no"

File Metadata

Mime Type
text/plain
Expires
Mon, May 18, 3:30 PM (3 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33254181
Default Alt Text
D31044.id91775.diff (729 B)

Event Timeline