diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-02-14 22:26:50 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-02-14 22:26:50 +0100 |
commit | d869f86645fc07dc83b89b68f1a22d91ebe29439 (patch) | |
tree | a3c2c1167bb34c8d0367d77e1a5734fc842d9f30 /tools/testing/selftests/timers/Makefile | |
parent | 030fc443aef663df71cd834331fd8f1ec10c30c0 (diff) | |
parent | 74e96711e3379fc66630f2a1d184947f80cf2c48 (diff) | |
download | linux-d869f86645fc07dc83b89b68f1a22d91ebe29439.tar.gz |
Merge branch 'linus' into irq/core
Pick up upstream changes to avoid conflicts for pending patches.
Diffstat (limited to 'tools/testing/selftests/timers/Makefile')
-rw-r--r-- | tools/testing/selftests/timers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile index c02683cfb6c9..7656c7ce79d9 100644 --- a/tools/testing/selftests/timers/Makefile +++ b/tools/testing/selftests/timers/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 CFLAGS += -O3 -Wl,-no-as-needed -Wall -LDFLAGS += -lrt -lpthread -lm +LDLIBS += -lrt -lpthread -lm # these are all "safe" tests that don't modify # system time or require escalated privileges |