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) | |
| download | openssh-git-b218055e59a7c1a1816f7a55ca18e3f3c05d63a4.tar.gz | |
(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 692b0073..a3760562 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,9 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ CC=@CC@ LD=@LD@ CFLAGS=@CFLAGS@ +CFLAGS_NOPIE=@CFLAGS_NOPIE@ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ +PICFLAG=@PICFLAG@ LIBS=@LIBS@ K5LIBS=@K5LIBS@ GSSLIBS=@GSSLIBS@ @@ -601,7 +603,7 @@ SK_DUMMY_OBJS=\ ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo .c.lo: Makefile.in config.h - $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -c $< -o $@ + $(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@ regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS) $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \ |