mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 02:53:48 +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
30 lines
951 B
Diff
30 lines
951 B
Diff
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
|
|
index 264b3d3..254d946 100644
|
|
--- a/cipher/Makefile.am
|
|
+++ b/cipher/Makefile.am
|
|
@@ -19,6 +19,13 @@
|
|
|
|
# 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 ?= .
|
|
+
|
|
# Need to include ../src in addition to top_srcdir because gcrypt.h is
|
|
# a built header.
|
|
AM_CPPFLAGS = -I../src -I$(top_srcdir)/src -I../mpi -I$(top_srcdir)/mpi
|
|
@@ -144,8 +151,8 @@ EXTRA_libcipher_la_SOURCES = \
|
|
blake2b-amd64-avx2.S blake2s-amd64-avx.S
|
|
|
|
gost28147.lo: gost-sb.h
|
|
-gost-sb.h: gost-s-box
|
|
- ./gost-s-box $@
|
|
+gost-sb.h: $(HOST_TOOLS_PREFIX)/gost-s-box
|
|
+ $(HOST_TOOLS_PREFIX)/gost-s-box $@
|
|
|
|
gost-s-box: gost-s-box.c
|
|
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
|