diff options
| author | Wolfgang Hommel <wolfcw@users.noreply.github.com> | 2020-04-08 19:47:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 19:47:46 +0200 |
| commit | f8a0ad249617b022484392dea4ea57948e6ffe9a (patch) | |
| tree | 18fc732f20c9fc2e1f18e2f205aec99c7370495f | |
| parent | 04e78e67bf4f7b789292b920b65375472b7caab0 (diff) | |
| parent | 0e3269efdc21cf73689358b195c5744f6a219787 (diff) | |
| download | libfaketime-develop.tar.gz | |
Merge pull request #244 from sdettmer/dev/sde/faketime_link_flagsdevelop
Added support for FAKETIME_LINK_FLAGS for #243.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README.packagers | 3 | ||||
| -rw-r--r-- | src/Makefile | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ + - Additional link-time LDFLAGS can be passed via the + environment variable FAKETIME_LINK_FLAGS when + running 'make'. + Since 0.9.8: - Compile-time CFLAG FAKE_SETTIME can be enabled to intercept calls to clock_settime(), settimeofday(), and diff --git a/README.packagers b/README.packagers index c61571e..d2ef290 100644 --- a/README.packagers +++ b/README.packagers @@ -42,7 +42,8 @@ variable, so for example FAKETIME_COMPILE_CFLAGS="-DFORCE_PTHREAD_NONVER" make test would create the libfaketime binaries and run the tests with the -FORCE_PTHREAD_NONVER flag set in a single step. +FORCE_PTHREAD_NONVER flag set in a single step. Likewise there is +FAKETIME_LINK_FLAGS. Please do not use FORCE_MONOTONIC_FIX by default, as it would result in incorrect operations on platforms that do not need it. diff --git a/src/Makefile b/src/Makefile index 4f67ca3..eb3d2a0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -79,7 +79,7 @@ endif LIB_LDFLAGS += -shared -LDFLAGS += -lpthread +LDFLAGS += $(FAKETIME_LINK_FLAGS) -lpthread ifneq ($(PLATFORM),SunOS) LDFLAGS += -Wl,--version-script=libfaketime.map endif |