diff options
| author | jstebbins <[email protected]> | 2015-01-18 17:25:51 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2015-01-18 17:25:51 +0000 |
| commit | d972a8646edc79e7f4e373c51dc2fb77233989f2 (patch) | |
| tree | 9dfa9dd68cc8d4141f2b573d726f949bdc28a8ab /test | |
| parent | 9250daa1b69db695007f2b43ae19ec2d66112ef9 (diff) | |
Work around fedora mingw pthread library requirement
Fedora mingw seems to require it's own pthread library which causes build
conflicts with our pthread lib. So this patch distinguishes whether
libpthread or libpthreadGC2 is already installed on the system and uses
the appropriate system lib when found.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6766 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
| -rw-r--r-- | test/module.defs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/module.defs b/test/module.defs index 6f9904852..1f794e93a 100644 --- a/test/module.defs +++ b/test/module.defs @@ -60,7 +60,12 @@ endif ifeq (1,$(FEATURE.hwd)) TEST.GCC.D += USE_HWD endif - TEST.GCC.l += pthreadGC2 iconv ws2_32 regex +ifeq (1,$(HAS.pthread)) + TEST.GCC.l += pthread +else + TEST.GCC.l += pthreadGC2 +endif + TEST.GCC.l += iconv ws2_32 regex TEST.GCC.D += PTW32_STATIC_LIB TEST.GCC.args.extra.exe++ += -static endif # (1-mingw,$(BUILD.cross)-$(BUILD.system)) |