Skip to content

Commit

Permalink
Makefile.defs: use dedicated vars for pthread mutex flags
Browse files Browse the repository at this point in the history
- CC_EXTRA_OPTS and LD_EXTRA_OPTS may be set from environment

(cherry picked from commit be34082)
  • Loading branch information
miconda authored and linuxmaniac committed Dec 17, 2019
1 parent 51a3910 commit be48848
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions src/Makefile.defs
Expand Up @@ -210,8 +210,11 @@ endif
endif

ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1)
CC_EXTRA_OPTS+= -pthread -DKSR_PTHREAD_MUTEX_SHARED
LD_EXTRA_OPTS+= -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions
CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED
LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions
else
CC_PMUTEX_OPTS =
LD_PMUTEX_OPTS =
endif

ifeq ($(OS), solaris)
Expand Down Expand Up @@ -1639,7 +1642,7 @@ $(error Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
endif #CC_NAME, gcc
endif #ARCH, ppc

CFLAGS+= $(CC_EXTRA_OPTS)
CFLAGS+= $(CC_EXTRA_OPTS) $(CC_PMUTEX_OPTS)


# setting LDFLAGS
Expand Down Expand Up @@ -1688,9 +1691,9 @@ ifeq ($(CC_NAME), clang)
LD_RPATH=-Wl,-rpath,
endif

LDFLAGS+= $(LD_EXTRA_OPTS)
MOD_LDFLAGS+= $(LD_EXTRA_OPTS)
LIB_LDFLAGS+= $(LD_EXTRA_OPTS)
LDFLAGS+= $(LD_EXTRA_OPTS) $(LD_PMUTEX_OPTS)
MOD_LDFLAGS+= $(LD_EXTRA_OPTS) $(LD_PMUTEX_OPTS)
LIB_LDFLAGS+= $(LD_EXTRA_OPTS) $(LD_PMUTEX_OPTS)

else #mode,release
ifeq ($(CC_NAME), gcc)
Expand Down Expand Up @@ -2134,7 +2137,8 @@ saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \
# variable changeable at compile time
# extra: prefix DESTDIR BASEDIR basedirt
saved_chg_vars:=\
CC_EXTRA_OPTS CPUTYPE CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \
CC_EXTRA_OPTS CC_PMUTEX_OPTS CPUTYPE CFLAGS_RM CFLAGS MOD_CFLAGS \
LIB_CFLAGS UTILS_CFLAGS \
BASEDIR basedir DESTDIR LIBDIR RUNBASEDIR runbasedir \
PREFIX prefix \
cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \
Expand Down

0 comments on commit be48848

Please sign in to comment.