diff options
| author | Tobias Gruetzmacher <tobias-git@23.gs> | 2014-03-07 16:51:17 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-03-08 05:32:28 (GMT) |
| commit | dfd0b8866255aac8d0e4fed14d1f2a810a0f94e8 (patch) | |
| tree | 17d0bbe80afaf5a3defb14b9e67befeb9aeb9dbb /src/pthreads-w32.mk | |
| parent | a4df15a1346d62d9c07d34df59d9d6067ca57429 (diff) | |
| download | mxe-dfd0b8866255aac8d0e4fed14d1f2a810a0f94e8.zip mxe-dfd0b8866255aac8d0e4fed14d1f2a810a0f94e8.tar.gz mxe-dfd0b8866255aac8d0e4fed14d1f2a810a0f94e8.tar.bz2 | |
package pthreads-w32: fix for shared build
- Only patch header files to force static build when we are actually
running a static build.
- Install DLL into bin and stub .a into lib for shared.
Diffstat (limited to 'src/pthreads-w32.mk')
| -rw-r--r-- | src/pthreads-w32.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pthreads-w32.mk b/src/pthreads-w32.mk index 1576df5..ba264e2 100644 --- a/src/pthreads-w32.mk +++ b/src/pthreads-w32.mk @@ -22,9 +22,11 @@ define $(PKG)_BUILD_i686-pc-mingw32 $(if $(BUILD_STATIC),GC-static,GC-inlined) \ CROSS='$(TARGET)-' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + # This is the DLL include lib on a shared build + $(INSTALL) -m644 '$(1)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a' $(if $(BUILD_STATIC), \ - $(INSTALL) -m644 '$(1)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a',\ - $(INSTALL) -m644 '$(1)/pthreadGC2.dll' '$(PREFIX)/$(TARGET)/lib/pthread.dll') + $(SED) -i 's/defined(PTW32_STATIC_LIB)/1/' '$(1)/pthread.h' '$(1)/sched.h' '$(1)/semaphore.h', + $(INSTALL) -m644 '$(1)/pthreadGC2.dll' '$(PREFIX)/$(TARGET)/bin/pthread.dll') $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' $(INSTALL) -m644 '$(1)/pthread.h' '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -m644 '$(1)/sched.h' '$(PREFIX)/$(TARGET)/include/' |