summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2019-11-29 12:32:23 +1100
committerDamien Miller <djm@mindrot.org>2019-11-29 12:32:23 +1100
commitb218055e59a7c1a1816f7a55ca18e3f3c05d63a4 (patch)
tree10bc1600b9dca94071750cba7cc637158450cba7 /Makefile.in
parent0dedb703adcd98d0dbc4479f5f312a2bd3df2850 (diff)
(yet) another x-platform fix for sk-dummy.so
Check for -fPIC support from compiler Compile libopenbsd-compat -fPIC Don't mix -fPIE and -fPIC when compiling
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 692b00732..a37605625 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,9 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
43CC=@CC@ 43CC=@CC@
44LD=@LD@ 44LD=@LD@
45CFLAGS=@CFLAGS@ 45CFLAGS=@CFLAGS@
46CFLAGS_NOPIE=@CFLAGS_NOPIE@
46CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ 47CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
48PICFLAG=@PICFLAG@
47LIBS=@LIBS@ 49LIBS=@LIBS@
48K5LIBS=@K5LIBS@ 50K5LIBS=@K5LIBS@
49GSSLIBS=@GSSLIBS@ 51GSSLIBS=@GSSLIBS@
@@ -601,7 +603,7 @@ SK_DUMMY_OBJS=\
601 ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo 603 ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo
602 604
603.c.lo: Makefile.in config.h 605.c.lo: Makefile.in config.h
604 $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@ 606 $(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@
605 607
606regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS) 608regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)
607 $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \ 609 $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \