diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2019-07-16 13:00:51 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2019-07-18 11:27:40 -0400 |
| commit | 732855a483709345a5c0f49504f45cb8da3f883a (patch) | |
| tree | 0207eecdc199af46809f7638e782698b13395ea1 | |
| parent | 7ffab1750fdec31d6f6f62c3ff50f1a33eacda5c (diff) | |
| download | libgpg-error-dkg-fix-T4643.tar.gz | |
build: Use {CFLAGS,CPPFLAGS, LDFLAGS}_FOR_BUILD for helper programsdkg-fix-T4643
* doc/Makefile.am: add CPPFLAGS_FOR_BUILD for yat2m-for-build (other
flags were already present).
* src/Makefile.am: add {CFLAGS,CPPFLAGS,LDFLAGS}_FOR_BUILD for
mkhelper, mkw32errmap, and mkerrcodes.
Debian-bug-id: 932213
GnuPG-bug-id: 4643
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
| -rw-r--r-- | doc/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 5d6f201..46b4545 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -43,7 +43,8 @@ YAT2M_DEP = yat2m-for-build$(EXEEXT_FOR_BUILD) CLEANFILES += yat2m-for-build$(EXEEXT_FOR_BUILD) yat2m-for-build$(EXEEXT_FOR_BUILD): yat2m.c - $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(srcdir)/yat2m.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/yat2m.c else YAT2M_CMD = ./yat2m$(EXEEXT) YAT2M_DEP = yat2m$(EXEEXT) diff --git a/src/Makefile.am b/src/Makefile.am index fb4ef48..8e4ca9d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -279,13 +279,15 @@ gpg-error.def: Makefile gpg-error.def.in # It is correct to use $(CC_FOR_BUILD) here. We want to run the # program at build time. mkerrcodes$(EXEEXT_FOR_BUILD): mkerrcodes.c mkerrcodes.h Makefile - $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c if HAVE_W32CE_SYSTEM # It is correct to use $(CC_FOR_BUILD) here. We want to run the # program at build time. mkw32errmap$(EXEEXT_FOR_BUILD): mkw32errmap.c mkw32errmap.tab.h Makefile - $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c endif code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile @@ -298,7 +300,8 @@ errnos-sym.h: Makefile mkstrtable.awk errnos.in mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile - $(CC_FOR_BUILD) -g -O0 -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ + $(CPPFLAGS_FOR_BUILD) -g -O0 -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c parts_of_gpg_error_h = \ gpg-error.h.in \ |