diff options
author | Brent Cook <bcook@openbsd.org> | 2014-07-17 21:20:34 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2014-07-18 09:19:17 -0500 |
commit | d697fdb4afb08bb46027a5efd1f8040bfdb8380e (patch) | |
tree | 9308884ee7206da1acb2a534e26c10f3ef308edd /crypto | |
parent | 0bc4bdde5f8140b23af15482000d733dfe700968 (diff) | |
download | portable-d697fdb4afb08bb46027a5efd1f8040bfdb8380e.tar.gz portable-d697fdb4afb08bb46027a5efd1f8040bfdb8380e.tar.bz2 portable-d697fdb4afb08bb46027a5efd1f8040bfdb8380e.zip |
initial underpinnings for mingw/cross compilation support
Use canonical host rather than target so that this works:
CC=i686-w64-mingw32-gcc ./configure --host=i686-w64-mingw32
Conditionally compile Linux issetugid compatibility function
ok beck@
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/Makefile.am.tpl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crypto/Makefile.am.tpl b/crypto/Makefile.am.tpl index 20c3495..d79a270 100644 --- a/crypto/Makefile.am.tpl +++ b/crypto/Makefile.am.tpl | |||
@@ -45,22 +45,27 @@ if NO_ARC4RANDOM_BUF | |||
45 | libcompat_la_SOURCES += compat/arc4random.c | 45 | libcompat_la_SOURCES += compat/arc4random.c |
46 | 46 | ||
47 | if NO_GETENTROPY | 47 | if NO_GETENTROPY |
48 | if TARGET_LINUX | 48 | if HOST_LINUX |
49 | libcompat_la_SOURCES += compat/getentropy_linux.c | 49 | libcompat_la_SOURCES += compat/getentropy_linux.c |
50 | endif | 50 | endif |
51 | if TARGET_DARWIN | 51 | if HOST_DARWIN |
52 | libcompat_la_SOURCES += compat/getentropy_osx.c | 52 | libcompat_la_SOURCES += compat/getentropy_osx.c |
53 | endif | 53 | endif |
54 | if TARGET_SOLARIS | 54 | if HOST_SOLARIS |
55 | libcompat_la_SOURCES += compat/getentropy_solaris.c | 55 | libcompat_la_SOURCES += compat/getentropy_solaris.c |
56 | endif | 56 | endif |
57 | if HOST_WIN | ||
58 | libcompat_la_SOURCES += compat/getentropy_win.c | ||
59 | endif | ||
57 | endif | 60 | endif |
58 | 61 | ||
59 | endif | 62 | endif |
60 | 63 | ||
61 | if NO_ISSETUGID | 64 | if NO_ISSETUGID |
65 | if HOST_LINUX | ||
62 | libcompat_la_SOURCES += compat/issetugid_linux.c | 66 | libcompat_la_SOURCES += compat/issetugid_linux.c |
63 | endif | 67 | endif |
68 | endif | ||
64 | 69 | ||
65 | noinst_HEADERS = des/ncbc_enc.c | 70 | noinst_HEADERS = des/ncbc_enc.c |
66 | noinst_HEADERS += compat/thread_private.h | 71 | noinst_HEADERS += compat/thread_private.h |