diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-27 22:19:39 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-01-27 22:19:39 +0100 |
| commit | 21b1f21e6092acd023310718191c1bfdde4edab3 (patch) | |
| tree | cd8aa39bc71d06f8a47588164b04cfee37e6a2ae | |
| parent | a7e90478b6bd2ca0a8df8db9a0ae6448f0b391af (diff) | |
Fix duplicate definition of LIBPTHREAD_VERSION
Now that libpthread is built along glibc, it should follow that
versioning anyway.
* Makefile (pthread-version): Do not define.
* sysdeps/pthread/Makefile [$(subdir) == posix] (CFLAGS-confstr.c): Set
-DLIBPTHREAD_VERSION='"HTL $(version)"'.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/Makefile | 4 |
2 files changed, 2 insertions, 4 deletions
@@ -34,8 +34,6 @@ makemode := library else subdir := htl -pthread-version := 0.3 - srcdir = . endif diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index f5dbd25..12bb54e 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -1,7 +1,7 @@ ifeq ($(subdir),rt) librt-sysdep_routines += timer_routines endif + ifeq ($(subdir),posix) - # FIXME: this is not getting $(pthread-version) from libpthread/Makefile! -CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"libpthread $(pthread-version)"' +CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"HTL $(version)"' endif |