mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 20:59:12 +08:00
89a2b29130
* Use VERSION * Add nls feature and gettext deps * Fix export of libintl dep * Fix mingw on windows * Fix crossbuilds * Cleanup * Keep translations for nls * Add license * [shiftmedia-libgpg-error] Split from pristine source port, update * [libgpg-error] Update, official tarballs, cross builds * [libgcrypt] Official tarballs, fix cross builds * [libgcrypt] Update copyright * [libassuan] Update, official tarballs, cross builds * [gpgme] Update, cleanup * [gpgme] Update copyright * Update versions * [shiftmedia-libgcrypt] Update * No port libgpg * Add missing version file * Use make OPTIONS * Update versions * Revise build-tools pattern
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 6b9a46d..5156865 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -19,6 +19,13 @@
|
|
# SPDX-License-Identifier: LGPL-2.1+
|
|
## Process this file with automake to produce Makefile.in
|
|
|
|
+# Building host tools for native triplet, or not at all
|
|
+CPPFLAGS_FOR_BUILD = $(CPPFLAGS)
|
|
+CFLAGS_FOR_BUILD = $(CFLAGS)
|
|
+LDFLAGS_FOR_BUILD = $(LDFLAGS)
|
|
+# Using native tools, either this build or from host triplet
|
|
+HOST_TOOLS_PREFIX ?= .
|
|
+
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = libassuan.pc
|
|
|
|
@@ -152,6 +159,6 @@ mkheader: mkheader.c Makefile
|
|
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \
|
|
$(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
|
|
|
|
-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
|
|
- ./mkheader $(host_os) $(srcdir)/assuan.h.in \
|
|
+assuan.h: assuan.h.in $(HOST_TOOLS_PREFIX)/mkheader $(parts_of_assuan_h)
|
|
+ $(HOST_TOOLS_PREFIX)/mkheader $(host_os) $(srcdir)/assuan.h.in \
|
|
$(PACKAGE_VERSION) $(VERSION_NUMBER) >$@
|