Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
8bb6303d
Commit
8bb6303d
authored
20 years ago
by
deuce
Browse files
Options
Downloads
Patches
Plain Diff
-lpthread is actually an XPDEV-MT_LIBS thing, not a common MT_LDFLAGS thing
(Needed for static linking)
parent
c4f1042e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/build/Common.gmake
+1
-4
1 addition, 4 deletions
src/build/Common.gmake
src/xpdev/Common.gmake
+14
-2
14 additions, 2 deletions
src/xpdev/Common.gmake
with
15 additions
and
6 deletions
src/build/Common.gmake
+
1
−
4
View file @
8bb6303d
...
@@ -242,7 +242,7 @@ else
...
@@ -242,7 +242,7 @@ else
else
else
ifeq ($(os),netbsd) # NetBSD
ifeq ($(os),netbsd) # NetBSD
MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_LDFLAGS += -L/usr/pkg/lib
-lpthread
MT_LDFLAGS += -L/usr/pkg/lib
XP_SEM := 1
XP_SEM := 1
else
else
ifeq ($(os),qnx) # QNX
ifeq ($(os),qnx) # QNX
...
@@ -250,18 +250,15 @@ else
...
@@ -250,18 +250,15 @@ else
ifeq ($(os),darwin) # Darwin/Mac OS X
ifeq ($(os),darwin) # Darwin/Mac OS X
CFLAGS += -D__unix__
CFLAGS += -D__unix__
MT_CFLAGS += -DUSE_XP_SEMAPHORES -D__DARWIN__
MT_CFLAGS += -DUSE_XP_SEMAPHORES -D__DARWIN__
MT_LDFLAGS += -lpthread
XP_SEM := 1
XP_SEM := 1
else
else
ifeq ($(os),sunos) # Solaris
ifeq ($(os),sunos) # Solaris
XP_SEM := 1
XP_SEM := 1
MT_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
MT_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_LDFLAGS += -lpthread
else # Linux / Other UNIX
else # Linux / Other UNIX
XP_SEM := 1
XP_SEM := 1
MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_CFLAGS += -DUSE_XP_SEMAPHORES
MT_LDFLAGS += -lpthread
endif
endif
endif
endif
endif
endif
...
...
This diff is collapsed.
Click to expand it.
src/xpdev/Common.gmake
+
14
−
2
View file @
8bb6303d
...
@@ -2,9 +2,21 @@ XPDEV_LIBS += -lm
...
@@ -2,9 +2,21 @@ XPDEV_LIBS += -lm
XPDEV-MT_LIBS += -lm
XPDEV-MT_LIBS += -lm
ifeq ($(os),netbsd) # NetBSD
ifeq ($(os),netbsd) # NetBSD
XPDEV_LIBS += -lossaudio
XPDEV_LIBS += -lossaudio
XPDEV-MT_LIBS += -lossaudio
XPDEV-MT_LIBS += -lossaudio
-lpthread
endif
endif
ifeq ($(os),openbsd) # OpenBSD
ifeq ($(os),openbsd) # OpenBSD
XPDEV_LIBS += -lossaudio
XPDEV_LIBS += -lossaudio
XPDEV-MT_LIBS += -lossaudio
XPDEV-MT_LIBS += -lossaudio -lpthread
endif
ifeq ($(os),sunos) # Solaris
XPDEV-MT_LIBS += -lpthread
endif
ifeq ($(os),darwin) # Mac OS/X
XPDEV-MT_LIBS += -lpthread
endif
ifeq ($(os),qnx) # QNX
XPDEV-MT_LIBS += -lpthread
endif
ifeq ($(os),linux) # Linux
XPDEV-MT_LIBS += -lpthread
endif
endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment