diff options
| author | emaste <emaste@FreeBSD.org> | 2013-02-20 20:42:56 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2013-02-20 20:42:56 +0000 |
| commit | 4fe522ce7c2313c8285e9200c6c72b0a75322722 (patch) | |
| tree | 30bf41b8e4ce589cfdad13c19b72901be1d52f05 /share/mk | |
| parent | 518d1fe89bb5998f5c172f5f2cb6c169a6bfb31c (diff) | |
| download | FreeBSD-src-4fe522ce7c2313c8285e9200c6c72b0a75322722.zip FreeBSD-src-4fe522ce7c2313c8285e9200c6c72b0a75322722.tar.gz | |
Fix parallel build race with DEBUG_FLAGS
Reported by: Jan Beich on freebsd-current
Tested by: markj
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.lib.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index f406c23..3664210 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -113,12 +113,20 @@ PO_FLAG=-pg all: objwarn +.if defined(SHLIB_NAME) +.if defined(DEBUG_FLAGS) +SHLIB_NAME_FULL=${SHLIB_NAME}.debug +.else +SHLIB_NAME_FULL=${SHLIB_NAME} +.endif +.endif + .include <bsd.symver.mk> # Allow libraries to specify their own version map or have it # automatically generated (see bsd.symver.mk above). .if ${MK_SYMVER} == "yes" && !empty(VERSION_MAP) -${SHLIB_NAME}: ${VERSION_MAP} +${SHLIB_NAME_FULL}: ${VERSION_MAP} LDFLAGS+= -Wl,--version-script=${VERSION_MAP} .endif @@ -165,12 +173,6 @@ SOBJS+= ${OBJS:.o=.So} .if defined(SHLIB_NAME) _LIBS+= ${SHLIB_NAME} -.if defined(DEBUG_FLAGS) -SHLIB_NAME_FULL=${SHLIB_NAME}.debug -.else -SHLIB_NAME_FULL=${SHLIB_NAME} -.endif - SOLINKOPTS= -shared -Wl,-x .if !defined(ALLOW_SHARED_TEXTREL) SOLINKOPTS+= -Wl,--fatal-warnings -Wl,--warn-shared-textrel |
