aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Shebs <stanshebs@google.com>2016-02-10 14:55:24 -0800
committerStan Shebs <stanshebs@google.com>2016-02-10 14:55:24 -0800
commit74df9774016da10d06a6a2e7ca3c55096d2e7909 (patch)
tree554558f943d7adc46619f63a42ae890d61058579
parentbab244a0066749511f2c76efa2a499b39b6181ef (diff)
downloadglibc-74df9774016da10d06a6a2e7ca3c55096d2e7909.zip
glibc-74df9774016da10d06a6a2e7ca3c55096d2e7909.tar.gz
glibc-74df9774016da10d06a6a2e7ca3c55096d2e7909.tar.bz2
Small fix to patch from last October, lets tst-key5 build.
-rw-r--r--README.google4
-rw-r--r--nptl/Makefile2
2 files changed, 5 insertions, 1 deletions
diff --git a/README.google b/README.google
index 0b0792e..00a22f9 100644
--- a/README.google
+++ b/README.google
@@ -549,3 +549,7 @@ nptl/allocatestack.c
nptl/Makefile
nptl/tst-basic8.c
For b/24399992 unlock guard pages to avoid wasting memory.
+
+nptl/Makefile
+ Unbreak building of tst-key5
+ (stanshebs, google-local)
diff --git a/nptl/Makefile b/nptl/Makefile
index 3176e54..8c4bd34 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -609,7 +609,7 @@ $(objpfx)tst-execstack: $(libdl)
$(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so
LDFLAGS-tst-execstack = -Wl,-z,noexecstack
-LDFLAGS-tst-key5 = -lrt
+$(objpfx)tst-key5: $(librt)
$(objpfx)tst-fini1mod.so: $(shared-thread-library)