aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2018-03-24 12:15:43 -0400
committerRich Felker <dalias@aerifal.cx>2018-03-24 12:15:43 -0400
commita7c53e0c2cd8fc45eac90c0468e44697019ceda6 (patch)
treee88d3c7d13539668b5623a5299946ea4ee0164d2
parent919ad8d5fbb1caa18c3719304ffeeb0e0dde1bb5 (diff)
downloadmusl-a7c53e0c2cd8fc45eac90c0468e44697019ceda6.zip
musl-a7c53e0c2cd8fc45eac90c0468e44697019ceda6.tar.gz
musl-a7c53e0c2cd8fc45eac90c0468e44697019ceda6.tar.bz2
fix out-of-tree build of crt files with stack protector enabled
the makefile logic for these files was wrong in the out-of-tree case, but it likely only affected the "all" level of stack protector.
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 308ddaa..46fc91e 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.o) $(OPTIMIZE_SRCS:$(srcdir)/%.c=obj/%.lo):
MEMOPS_SRCS = src/string/memcpy.c src/string/memmove.c src/string/memcmp.c src/string/memset.c
$(MEMOPS_SRCS:%.c=obj/%.o) $(MEMOPS_SRCS:%.c=obj/%.lo): CFLAGS_ALL += $(CFLAGS_MEMOPS)
-NOSSP_SRCS = $(wildcard crt/*.c) \
+NOSSP_SRCS = $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/crt/*.c)) \
src/env/__libc_start_main.c src/env/__init_tls.c \
src/env/__stack_chk_fail.c \
src/thread/__set_thread_area.c src/thread/$(ARCH)/__set_thread_area.c \