Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
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
Container Registry
Model registry
Operate
Environments
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
FSL
base
Commits
0dc0d454
Commit
0dc0d454
authored
3 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Plain Diff
Merge branch 'mnt/pthread' into 'master'
Support multi threading on linux See merge request
!39
parents
01a593b9
56d5cebb
No related branches found
No related tags found
1 merge request
!39
Support multi threading on linux
Pipeline
#12320
passed
3 years ago
Stage: fsl-ci-build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+8
-0
8 additions, 0 deletions
CHANGELOG.md
config/buildSettings.mk
+5
-1
5 additions, 1 deletion
config/buildSettings.mk
config/rules.mk
+8
-2
8 additions, 2 deletions
config/rules.mk
with
21 additions
and
3 deletions
CHANGELOG.md
+
8
−
0
View file @
0dc0d454
# FSL base project changelog
# FSL base project changelog
## 2112.0 (Saturday 11th December 2021)
*
Add
`-pthread`
to the standard C++ compiler flags for
`g++`
.
*
Adjust the
`depend.mk`
rule to allow saving object files to a separate
build directory.
## 2111.9 (Wednesday 8th December 2021)
## 2111.9 (Wednesday 8th December 2021)
*
If the
`${LDFLAGS}`
environment variable is set in the environment, any
*
If the
`${LDFLAGS}`
environment variable is set in the environment, any
...
...
This diff is collapsed.
Click to expand it.
config/buildSettings.mk
+
5
−
1
View file @
0dc0d454
...
@@ -163,7 +163,11 @@ ifeq ($(SYSTYPE), Linux)
...
@@ -163,7 +163,11 @@ ifeq ($(SYSTYPE), Linux)
endif
endif
LDFLAGS
+=
-Wl
,-rpath,
'
${
FSLDIR
}
/lib'
\
LDFLAGS
+=
-Wl
,-rpath,
'
${
FSLDIR
}
/lib'
\
-Wl
,-rpath-link,
'
${
FSLDIR
}
/lib'
-Wl
,-rpath-link,
'
${
FSLDIR
}
/lib'
ARCHLIBS
+=
-lopenblas
-lz
-lm
# Libraries which are implicitly available
# to all projects for linking
ARCHCXXFLAGS
+=
-pthread
ARCHLIBS
+=
-lopenblas
-lz
-lm
endif
endif
#####################################################################
#####################################################################
...
...
This diff is collapsed.
Click to expand it.
config/rules.mk
+
8
−
2
View file @
0dc0d454
...
@@ -23,8 +23,14 @@ depend:
...
@@ -23,8 +23,14 @@ depend:
depend.mk
:
depend.mk
:
@
echo
Building dependency file depend.mk
@
echo
Building dependency file depend.mk
@
for
srcfile
in
`
find
.
-name
"*.c"
-or
-name
"*.cc"
-or
-name
"*.cxx"
-or
-name
"*.cpp"
-or
-name
"*.inc"
-or
-name
"*.hpp"
`
verylongdummyname
;
do
\
@
for
srcfile
in
`
find
.
-name
"*.c"
-or
-name
"*.cc"
-or
-name
"*.cxx"
-or
-name
"*.cpp"
-or
-name
"*.inc"
-or
-name
"*.hpp"
`
verylongdummyname
;
do
\
if
[
-f
$$
srcfile
]
;
then
\
if
[
-f
"
$${
srcfile
}
"
]
;
then
\
${
CC
}
-MM
${
INCFLAGS
}
$$
srcfile
>>
depend.mk
;
\
basename
=
"
$${
srcfile%.*
}
"
;
\
basename
=
"
$${
basename#./
}
"
;
\
objfile
=
"
$${
basename
}
.o"
;
\
depfile
=
"
$${
basename
}
.mk"
;
\
${
CC
}
-MM
-MT
"
${
BUILDDIR
}$${
objfile
}
"
-MF
"
$${
depfile
}
"
${
CPPFLAGS
}
${
INCFLAGS
}
"
$${
srcfile
}
"
>
/dev/null
;
\
cat
"
$${
depfile
}
"
>>
depend.mk
;
\
rm
-f
"
$${
depfile
}
"
;
\
else
\
else
\
touch
depend.mk
;
\
touch
depend.mk
;
\
fi
\
fi
\
...
...
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