summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2016-07-07 15:25:05 -0400
committerGitHub <[email protected]>2016-07-07 15:25:05 -0400
commit2e788a5c2dd2c6bca5f12c90501418fcfc406cf4 (patch)
treef2273bf31324a63d64630923ed4012accb695c05
parent1a7534331f90fbe2fd4d37337e112b32847be43c (diff)
parent1dfbd65736315147ceac9d03fdc987df0c343b59 (diff)
Merge pull request #252 from Rodeo314/pthread2
contrib: add a couple changes missed in previous commits. pthreadw32: module.defs fixes.
-rw-r--r--contrib/pthreadw32/module.defs13
1 files changed, 8 insertions, 5 deletions
diff --git a/contrib/pthreadw32/module.defs b/contrib/pthreadw32/module.defs
index 15e7f5a23..d6b279a2e 100644
--- a/contrib/pthreadw32/module.defs
+++ b/contrib/pthreadw32/module.defs
@@ -7,18 +7,20 @@ PTHREADW32.FETCH.md5 = 36ba827d6aa0fa9f9ae740a35626e2e3
PTHREADW32.CONFIGURE = $(TOUCH.exe) $@
-PTHREADW32.BUILD.extra = CROSS=$(BUILD.cross.prefix) clean GC-static
-PTHREADW32.BUILD.ntargets = clean GC-static
+PTHREADW32.CLEAN.ntargets = realclean
+
+PTHREADW32.BUILD.extra = CROSS=$(BUILD.cross.prefix)
+PTHREADW32.BUILD.ntargets = GC-static
define PTHREADW32.INSTALL
$(CP.exe) $(PTHREADW32.EXTRACT.dir/)pthread.h $(CONTRIB.build/)include/
- $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/ __declspec (dllimport)//g' $(CONTRIB.build/)include/pthread.h
+ $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/__declspec (dllexport) //g' -e 's/ __declspec (dllimport)//g' -e 's/__declspec (dllimport) //g' $(CONTRIB.build/)include/pthread.h
$(RM.exe) -f $(CONTRIB.build/)include/pthread.h.sedbak
$(CP.exe) $(PTHREADW32.EXTRACT.dir/)sched.h $(CONTRIB.build/)include/
- $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/ __declspec (dllimport)//g' -e 's/__declspec (dllimport) //g' $(CONTRIB.build/)include/sched.h
+ $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/__declspec (dllexport) //g' -e 's/ __declspec (dllimport)//g' -e 's/__declspec (dllimport) //g' $(CONTRIB.build/)include/sched.h
$(RM.exe) -f $(CONTRIB.build/)include/sched.h.sedbak
$(CP.exe) $(PTHREADW32.EXTRACT.dir/)semaphore.h $(CONTRIB.build/)include/
- $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/ __declspec (dllimport)//g' $(CONTRIB.build/)include/semaphore.h
+ $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/__declspec (dllexport) //g' -e 's/ __declspec (dllimport)//g' -e 's/__declspec (dllimport) //g' $(CONTRIB.build/)include/semaphore.h
$(RM.exe) -f $(CONTRIB.build/)include/semaphore.h.sedbak
$(CP.exe) $(PTHREADW32.EXTRACT.dir/)libpthreadGC2.a $(CONTRIB.build/)lib/
$(LN.exe) -sf ./libpthreadGC2.a $(CONTRIB.build/)lib/libpthread.a
@@ -27,6 +29,7 @@ endef
define PTHREADW32.UNINSTALL
$(RM.exe) -f $(CONTRIB.build/)lib/libpthreadGC2.a
+ $(RM.exe) -f $(CONTRIB.build/)lib/libpthread.a
$(RM.exe) -f $(CONTRIB.build/)include/pthread.h
$(RM.exe) -f $(CONTRIB.build/)include/sched.h
$(RM.exe) -f $(CONTRIB.build/)include/semaphore.h