about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-05-26 02:31:04 -0400
committerRich Felker <dalias@aerifal.cx>2015-05-26 02:31:04 -0400
commited0c8249825161036356a3616e8c5247c15d0927 (patch)
tree0e50d829cbe7fd976fdc79aa673de0c630adaf5d
parent9bbddf730f7837cf87f4c789fbb41a312e295d6c (diff)
downloadmusl-ed0c8249825161036356a3616e8c5247c15d0927.tar.gz
musl-ed0c8249825161036356a3616e8c5247c15d0927.tar.xz
musl-ed0c8249825161036356a3616e8c5247c15d0927.zip
fix incorrect application of visibility to Scrt1.o
commit de2b67f8d41e08caa56bf6540277f6561edb647f attempted to avoid
having vis.h affect crt files, but the Makefile variable used,
CRT_LIBS, refers to the final output copies in the lib directory, not
the copies in the crt build directory, and thus the -DCRT was not
applied.

while unlikely to be noticed, this regression probably broke
production of PIE executables whose main functions are not in the
executable but rather a shared library.
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6559295e..b9668b43 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ NOSSP_SRCS = $(wildcard crt/*.c) \
 	src/ldso/dlstart.c src/ldso/dynlink.c
 $(NOSSP_SRCS:%.c=%.o) $(NOSSP_SRCS:%.c=%.lo): CFLAGS += $(CFLAGS_NOSSP)
 
-$(CRT_LIBS): CFLAGS += -DCRT
+$(CRT_LIBS:lib/%=crt/%): CFLAGS += -DCRT
 
 # This incantation ensures that changes to any subarch asm files will
 # force the corresponding object file to be rebuilt, even if the implicit