You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1.1 KiB
26 lines
1.1 KiB
7 years ago
|
diff -Nru glibc-2.17-c758a686/nptl/Makefile glibc-2.17-c758a686/nptl/Makefile
|
||
|
|
--- glibc-2.17-c758a686/nptl/Makefile 2012-06-05 07:42:49.000000000 -0600
|
||
|
|
+++ glibc-2.17-c758a686/nptl/Makefile 2012-06-07 12:15:21.816318678 -0600
|
||
|
|
@@ -529,15 +529,19 @@ $(addprefix $(objpfx), \
|
||
|
|
$(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
|
||
|
|
$(objpfx)libpthread_nonshared.a
|
||
|
|
$(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so
|
||
|
|
-# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
|
||
|
|
+# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
|
||
|
|
# since otherwise libpthread.so comes before libc.so when linking.
|
||
|
|
$(addprefix $(objpfx), $(tests-reverse)): \
|
||
|
|
- $(objpfx)../libc.so $(objpfx)libpthread.so \
|
||
|
|
+ $(objpfx)linklibc.so $(objpfx)libpthread.so \
|
||
|
|
$(objpfx)libpthread_nonshared.a
|
||
|
|
$(objpfx)../libc.so: $(common-objpfx)libc.so ;
|
||
|
|
$(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
|
||
|
|
|
||
|
|
$(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
|
||
|
|
+
|
||
|
|
+$(objpfx)linklibc.so: $(common-objpfx)libc.so
|
||
|
|
+ ln -s ../libc.so $@
|
||
|
|
+generated += libclink.so
|
||
|
|
else
|
||
|
|
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
|
||
|
|
endif
|