compile sk-dummy.so with no-PIE version of LDFLAGS
This lets it pick up the -L path to libcrypto for example.
This commit is contained in:
parent
37f5b5346e
commit
443848155f
|
@ -61,6 +61,7 @@ SED=@SED@
|
||||||
ENT=@ENT@
|
ENT=@ENT@
|
||||||
XAUTH_PATH=@XAUTH_PATH@
|
XAUTH_PATH=@XAUTH_PATH@
|
||||||
LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
|
LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
|
||||||
|
LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@
|
||||||
EXEEXT=@EXEEXT@
|
EXEEXT=@EXEEXT@
|
||||||
MANFMT=@MANFMT@
|
MANFMT=@MANFMT@
|
||||||
MKDIR_P=@MKDIR_P@
|
MKDIR_P=@MKDIR_P@
|
||||||
|
@ -607,7 +608,7 @@ SK_DUMMY_OBJS=\
|
||||||
|
|
||||||
regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)
|
regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)
|
||||||
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \
|
$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \
|
||||||
-L. -Lopenbsd-compat -lopenbsd-compat $(LIBS)
|
-L. -Lopenbsd-compat -lopenbsd-compat $(LDFLAGS_NOPIE) $(LIBS)
|
||||||
|
|
||||||
regress-binaries: regress-prep $(LIBCOMPAT) \
|
regress-binaries: regress-prep $(LIBCOMPAT) \
|
||||||
regress/modpipe$(EXEEXT) \
|
regress/modpipe$(EXEEXT) \
|
||||||
|
|
|
@ -5313,8 +5313,10 @@ AC_SUBST([DEPEND], [$(cat $srcdir/.depend)])
|
||||||
CFLAGS="${CFLAGS} ${CFLAGS_AFTER}"
|
CFLAGS="${CFLAGS} ${CFLAGS_AFTER}"
|
||||||
LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}"
|
LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}"
|
||||||
|
|
||||||
# Make a copy of CFLAGS without -fpie
|
# Make a copy of CFLAGS/LDFLAGS without PIE options.
|
||||||
|
LDFLAGS_NOPIE=`echo "$LDFLAGS" | sed 's/ -pie//'`
|
||||||
CFLAGS_NOPIE=`echo "$CFLAGS" | sed 's/ -fPIE//'`
|
CFLAGS_NOPIE=`echo "$CFLAGS" | sed 's/ -fPIE//'`
|
||||||
|
AC_SUBST([LDFLAGS_NOPIE])
|
||||||
AC_SUBST([CFLAGS_NOPIE])
|
AC_SUBST([CFLAGS_NOPIE])
|
||||||
|
|
||||||
AC_EXEEXT
|
AC_EXEEXT
|
||||||
|
|
|
@ -15,6 +15,7 @@ AR=@AR@
|
||||||
RANLIB=@RANLIB@
|
RANLIB=@RANLIB@
|
||||||
INSTALL=@INSTALL@
|
INSTALL=@INSTALL@
|
||||||
LDFLAGS=-L. @LDFLAGS@
|
LDFLAGS=-L. @LDFLAGS@
|
||||||
|
LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@
|
||||||
|
|
||||||
OPENBSD=base64.o \
|
OPENBSD=base64.o \
|
||||||
basename.o \
|
basename.o \
|
||||||
|
|
Loading…
Reference in New Issue