diff options
-rw-r--r-- | Makefile.in | 3 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | openbsd-compat/Makefile.in | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index a37605625..1c5adfe99 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -61,6 +61,7 @@ SED=@SED@ | |||
61 | ENT=@ENT@ | 61 | ENT=@ENT@ |
62 | XAUTH_PATH=@XAUTH_PATH@ | 62 | XAUTH_PATH=@XAUTH_PATH@ |
63 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | 63 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ |
64 | LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@ | ||
64 | EXEEXT=@EXEEXT@ | 65 | EXEEXT=@EXEEXT@ |
65 | MANFMT=@MANFMT@ | 66 | MANFMT=@MANFMT@ |
66 | MKDIR_P=@MKDIR_P@ | 67 | MKDIR_P=@MKDIR_P@ |
@@ -607,7 +608,7 @@ SK_DUMMY_OBJS=\ | |||
607 | 608 | ||
608 | regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS) | 609 | regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS) |
609 | $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \ | 610 | $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \ |
610 | -L. -Lopenbsd-compat -lopenbsd-compat $(LIBS) | 611 | -L. -Lopenbsd-compat -lopenbsd-compat $(LDFLAGS_NOPIE) $(LIBS) |
611 | 612 | ||
612 | regress-binaries: regress-prep $(LIBCOMPAT) \ | 613 | regress-binaries: regress-prep $(LIBCOMPAT) \ |
613 | regress/modpipe$(EXEEXT) \ | 614 | regress/modpipe$(EXEEXT) \ |
diff --git a/configure.ac b/configure.ac index c57b2401f..a12fc0d12 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -5313,8 +5313,10 @@ AC_SUBST([DEPEND], [$(cat $srcdir/.depend)]) | |||
5313 | CFLAGS="${CFLAGS} ${CFLAGS_AFTER}" | 5313 | CFLAGS="${CFLAGS} ${CFLAGS_AFTER}" |
5314 | LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}" | 5314 | LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}" |
5315 | 5315 | ||
5316 | # Make a copy of CFLAGS without -fpie | 5316 | # Make a copy of CFLAGS/LDFLAGS without PIE options. |
5317 | LDFLAGS_NOPIE=`echo "$LDFLAGS" | sed 's/ -pie//'` | ||
5317 | CFLAGS_NOPIE=`echo "$CFLAGS" | sed 's/ -fPIE//'` | 5318 | CFLAGS_NOPIE=`echo "$CFLAGS" | sed 's/ -fPIE//'` |
5319 | AC_SUBST([LDFLAGS_NOPIE]) | ||
5318 | AC_SUBST([CFLAGS_NOPIE]) | 5320 | AC_SUBST([CFLAGS_NOPIE]) |
5319 | 5321 | ||
5320 | AC_EXEEXT | 5322 | AC_EXEEXT |
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index c2423324e..43544eba0 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -15,6 +15,7 @@ AR=@AR@ | |||
15 | RANLIB=@RANLIB@ | 15 | RANLIB=@RANLIB@ |
16 | INSTALL=@INSTALL@ | 16 | INSTALL=@INSTALL@ |
17 | LDFLAGS=-L. @LDFLAGS@ | 17 | LDFLAGS=-L. @LDFLAGS@ |
18 | LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@ | ||
18 | 19 | ||
19 | OPENBSD=base64.o \ | 20 | OPENBSD=base64.o \ |
20 | basename.o \ | 21 | basename.o \ |