summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2015-11-15 13:57:14 (GMT)
committerTony Theodore <tonyt@logyst.com>2015-11-15 13:57:14 (GMT)
commitde35582bc463a8bbf96e7f1d61b5be493cffe30f (patch)
tree591637c0794a98f24980336ddc6c40a07ff04ac7 /src
parent7875b279d9586a0d2ec4e8fcdc276f8abe1f54e9 (diff)
parent7c5cf02139cf5a10fe5a2accb52878be442827f6 (diff)
downloadmxe-de35582bc463a8bbf96e7f1d61b5be493cffe30f.zip
mxe-de35582bc463a8bbf96e7f1d61b5be493cffe30f.tar.gz
mxe-de35582bc463a8bbf96e7f1d61b5be493cffe30f.tar.bz2
Merge pull request #997 from LuaAndC/dlfcn-win32
dlfcn-win32: build test files and remove /tmp/test.{c,dll}
Diffstat (limited to 'src')
-rw-r--r--src/dlfcn-win32-1.fixes.patch25
-rw-r--r--src/dlfcn-win32.mk3
2 files changed, 26 insertions, 2 deletions
diff --git a/src/dlfcn-win32-1.fixes.patch b/src/dlfcn-win32-1.fixes.patch
new file mode 100644
index 0000000..fca8b88
--- /dev/null
+++ b/src/dlfcn-win32-1.fixes.patch
@@ -0,0 +1,25 @@
+This file is part of MXE.
+See index.html for further information.
+
+From f46d92e319ba2ce4d5fe46e4293a7f7fbb67935e Mon Sep 17 00:00:00 2001
+From: Boris Nagaev <bnagaev@gmail.com>
+Date: Sun, 15 Nov 2015 13:23:50 +0000
+Subject: [PATCH] configure: remove /tmp/test.dll /tmp/test.c
+
+
+diff --git a/configure b/configure
+index 91f7d07..e3473fe 100755
+--- a/configure
++++ b/configure
+@@ -160,7 +160,7 @@ void function(void)
+ { LoadLibrary(NULL); }
+ EOF
+ echo testing compiler: $cc -shared -o /tmp/test.dll /tmp/test.c
+-$cc -shared -o /tmp/test.dll /tmp/test.c
++$cc -shared -o /tmp/test.dll /tmp/test.c && rm /tmp/test.dll /tmp/test.c
+
+ test "$?" != 0 && {
+ echo "$cc could not create shared file with Windows API functions.";
+--
+2.1.4
+
diff --git a/src/dlfcn-win32.mk b/src/dlfcn-win32.mk
index ffac1fd..2daaea5 100644
--- a/src/dlfcn-win32.mk
+++ b/src/dlfcn-win32.mk
@@ -25,6 +25,5 @@ define $(PKG)_BUILD
--disable-static --enable-shared )
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
-
- # No test avalable temprorarily because MXE doesn't support shared build yet
+ $(MAKE) -C '$(1)' -j '$(JOBS)' test.exe testdll.dll
endef