Mercurial Mercurial > ns-3.5 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't use pthread option under cygwin
authorCraig Dowell <craigdo@ee.washington.edu>
Fri, 27 Mar 2009 09:58:04 -0700
changeset 4300 b25665f81754
parent 4299 834a7ac30481
child 4301 f1c83e54e541
don't use pthread option under cygwin
src/core/wscript file | annotate | diff | comparison | revisions 
--- a/src/core/wscript	Fri Mar 27 11:18:54 2009 +0000
+++ b/src/core/wscript	Fri Mar 27 09:58:04 2009 -0700
@@ -11,7 +11,7 @@
 
     # Check for POSIX threads
     test_env = conf.env.copy()
-    if Options.platform != 'darwin':
+    if Options.platform != 'darwin' and Options.platform != 'cygwin':
         test_env.append_value('LINKFLAGS', '-pthread')
         test_env.append_value('CXXFLAGS', '-pthread')
         test_env.append_value('CCFLAGS', '-pthread')
@@ -30,7 +30,7 @@
                               mandatory=False)
     if have_pthread:
         # darwin accepts -pthread but prints a warning saying it is ignored
-        if Options.platform != 'darwin':
+        if Options.platform != 'darwin' and Options.platform != 'cygwin':
             conf.env['CXXFLAGS_PTHREAD'] = '-pthread'
             conf.env['CCFLAGS_PTHREAD'] = '-pthread'
             conf.env['LINKFLAGS_PTHREAD'] = '-pthread'
ns-3.5