Skip to content

Commit 0f777df

Browse files
tilleamr-c
andcommitted
Propagate hardening options
Co-authored-by: Michael R. Crusoe <[email protected]>
1 parent f3e59fc commit 0f777df

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Makefile

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
CFLAGS= -g -Wall -O2 -Wc++-compat #-Wextra
2-
CPPFLAGS= -DHAVE_KALLOC
1+
CFLAGS+= -g -Wall -O2 -Wc++-compat #-Wextra
2+
CPPFLAGS+= -DHAVE_KALLOC
33
INCLUDES=
44
OBJS= kthread.o kalloc.o misc.o bseq.o sketch.o sdust.o options.o index.o \
55
lchain.o align.o hit.o seed.o map.o format.o pe.o esterr.o splitidx.o \
@@ -49,55 +49,55 @@ all:$(PROG)
4949
extra:all $(PROG_EXTRA)
5050

5151
minimap2:main.o libminimap2.a
52-
$(CC) $(CFLAGS) main.o -o $@ -L. -lminimap2 $(LIBS)
52+
$(CC) $(CFLAGS) $(LDFLAGS) main.o -o $@ -L. -lminimap2 $(LIBS)
5353

5454
minimap2-lite:example.o libminimap2.a
55-
$(CC) $(CFLAGS) $< -o $@ -L. -lminimap2 $(LIBS)
55+
$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ -L. -lminimap2 $(LIBS)
5656

5757
libminimap2.a:$(OBJS)
5858
$(AR) -csru $@ $(OBJS)
5959

6060
sdust:sdust.c kalloc.o kalloc.h kdq.h kvec.h kseq.h ketopt.h sdust.h
61-
$(CC) -D_SDUST_MAIN $(CFLAGS) $< kalloc.o -o $@ -lz
61+
$(CC) -D_SDUST_MAIN $(CFLAGS) $(LDFLAGS) $< kalloc.o -o $@ -lz
6262

6363
# SSE-specific targets on x86/x86_64
6464

6565
ifeq ($(arm_neon),) # if arm_neon is defined, compile this target with the default setting (i.e. no -msse2)
6666
ksw2_ll_sse.o:ksw2_ll_sse.c ksw2.h kalloc.h
67-
$(CC) -c $(CFLAGS) -msse2 $(CPPFLAGS) $(INCLUDES) $< -o $@
67+
$(CC) -c $(CFLAGS) $(LDFLAGS) -msse2 $(CPPFLAGS) $(INCLUDES) $< -o $@
6868
endif
6969

7070
ksw2_extz2_sse41.o:ksw2_extz2_sse.c ksw2.h kalloc.h
71-
$(CC) -c $(CFLAGS) -msse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH $(INCLUDES) $< -o $@
71+
$(CC) -c $(CFLAGS) $(LDFLAGS) -msse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH $(INCLUDES) $< -o $@
7272

7373
ksw2_extz2_sse2.o:ksw2_extz2_sse.c ksw2.h kalloc.h
74-
$(CC) -c $(CFLAGS) -msse2 -mno-sse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH -DKSW_SSE2_ONLY $(INCLUDES) $< -o $@
74+
$(CC) -c $(CFLAGS) $(LDFLAGS) -msse2 -mno-sse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH -DKSW_SSE2_ONLY $(INCLUDES) $< -o $@
7575

7676
ksw2_extd2_sse41.o:ksw2_extd2_sse.c ksw2.h kalloc.h
77-
$(CC) -c $(CFLAGS) -msse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH $(INCLUDES) $< -o $@
77+
$(CC) -c $(CFLAGS) $(LDFLAGS) -msse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH $(INCLUDES) $< -o $@
7878

7979
ksw2_extd2_sse2.o:ksw2_extd2_sse.c ksw2.h kalloc.h
80-
$(CC) -c $(CFLAGS) -msse2 -mno-sse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH -DKSW_SSE2_ONLY $(INCLUDES) $< -o $@
80+
$(CC) -c $(CFLAGS) $(LDFLAGS) -msse2 -mno-sse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH -DKSW_SSE2_ONLY $(INCLUDES) $< -o $@
8181

8282
ksw2_exts2_sse41.o:ksw2_exts2_sse.c ksw2.h kalloc.h
83-
$(CC) -c $(CFLAGS) -msse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH $(INCLUDES) $< -o $@
83+
$(CC) -c $(CFLAGS) $(LDFLAGS) -msse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH $(INCLUDES) $< -o $@
8484

8585
ksw2_exts2_sse2.o:ksw2_exts2_sse.c ksw2.h kalloc.h
86-
$(CC) -c $(CFLAGS) -msse2 -mno-sse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH -DKSW_SSE2_ONLY $(INCLUDES) $< -o $@
86+
$(CC) -c $(CFLAGS) $(LDFLAGS) -msse2 -mno-sse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH -DKSW_SSE2_ONLY $(INCLUDES) $< -o $@
8787

8888
ksw2_dispatch.o:ksw2_dispatch.c ksw2.h
89-
$(CC) -c $(CFLAGS) -msse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH $(INCLUDES) $< -o $@
89+
$(CC) -c $(CFLAGS) $(LDFLAGS) -msse4.1 $(CPPFLAGS) -DKSW_CPU_DISPATCH $(INCLUDES) $< -o $@
9090

9191
# NEON-specific targets on ARM
9292

9393
ksw2_extz2_neon.o:ksw2_extz2_sse.c ksw2.h kalloc.h
94-
$(CC) -c $(CFLAGS) $(CPPFLAGS) -DKSW_SSE2_ONLY -D__SSE2__ $(INCLUDES) $< -o $@
94+
$(CC) -c $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -DKSW_SSE2_ONLY -D__SSE2__ $(INCLUDES) $< -o $@
9595

9696
ksw2_extd2_neon.o:ksw2_extd2_sse.c ksw2.h kalloc.h
97-
$(CC) -c $(CFLAGS) $(CPPFLAGS) -DKSW_SSE2_ONLY -D__SSE2__ $(INCLUDES) $< -o $@
97+
$(CC) -c $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -DKSW_SSE2_ONLY -D__SSE2__ $(INCLUDES) $< -o $@
9898

9999
ksw2_exts2_neon.o:ksw2_exts2_sse.c ksw2.h kalloc.h
100-
$(CC) -c $(CFLAGS) $(CPPFLAGS) -DKSW_SSE2_ONLY -D__SSE2__ $(INCLUDES) $< -o $@
100+
$(CC) -c $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -DKSW_SSE2_ONLY -D__SSE2__ $(INCLUDES) $< -o $@
101101

102102
# other non-file targets
103103

0 commit comments

Comments
 (0)