Skip to content
Snippets Groups Projects
Commit 0dc0d454 authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

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!39Support multi threading on linux
Pipeline #12320 passed
# 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
......
...@@ -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
##################################################################### #####################################################################
......
...@@ -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 \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment