summaryrefslogtreecommitdiff
path: root/cross.mk
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2014-01-25 10:16:26 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2014-01-25 10:16:26 +0100
commit876eccea3f1121c2edda7688a869f2b8edaca7ba (patch)
tree1cb168824a0f50845137d8d13efa0962ad942572 /cross.mk
parentdeee61b0d9e05b22e524d892daf7e11b1c330d2b (diff)
downloadgnutls-876eccea3f1121c2edda7688a869f2b8edaca7ba.tar.gz
updated
Diffstat (limited to 'cross.mk')
-rw-r--r--cross.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/cross.mk b/cross.mk
index 8fd7c0948b..8df529f635 100644
--- a/cross.mk
+++ b/cross.mk
@@ -1,6 +1,6 @@
SMP=-j4
-GNUTLS_VERSION:=3.2.7
+GNUTLS_VERSION:=3.2.9
GNUTLS_FILE:=gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_DIR:=gnutls-$(GNUTLS_VERSION)
@@ -119,7 +119,8 @@ $(GNUTLS_DIR)/.installed: $(GNUTLS_DIR)/.configured
make -C $(GNUTLS_DIR) -C tests check $(SMP)
make -C $(GNUTLS_DIR) install -i
cp $(GNUTLS_DIR)/COPYING $(GNUTLS_DIR)/COPYING.LESSER $(CROSS_DIR)
- cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll $(BIN_DIR)/
+ -cp /usr/i686-w64-mingw32/sys-root/mingw/bin/libgcc_s_sjlj-1.dll $(BIN_DIR)/
+ -cp /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $(BIN_DIR)/
touch $@
$(GNUTLS_DIR)/.configured: $(NETTLE_DIR)/.installed $(P11_KIT_DIR)/.installed