diff options
author | Damien Miller <djm@mindrot.org> | 2019-11-29 12:32:23 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-29 12:32:23 +1100 |
commit | b218055e59a7c1a1816f7a55ca18e3f3c05d63a4 (patch) | |
tree | 10bc1600b9dca94071750cba7cc637158450cba7 /Makefile.in | |
parent | 0dedb703adcd98d0dbc4479f5f312a2bd3df2850 (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.in | 4 |
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)\" \ | |||
43 | CC=@CC@ | 43 | CC=@CC@ |
44 | LD=@LD@ | 44 | LD=@LD@ |
45 | CFLAGS=@CFLAGS@ | 45 | CFLAGS=@CFLAGS@ |
46 | CFLAGS_NOPIE=@CFLAGS_NOPIE@ | ||
46 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 47 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
48 | PICFLAG=@PICFLAG@ | ||
47 | LIBS=@LIBS@ | 49 | LIBS=@LIBS@ |
48 | K5LIBS=@K5LIBS@ | 50 | K5LIBS=@K5LIBS@ |
49 | GSSLIBS=@GSSLIBS@ | 51 | GSSLIBS=@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 | ||
606 | regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS) | 608 | regress/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) \ |