The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=83812c4eccb3c81e0fe97e9a5b325409ef8ba2ce
commit 83812c4eccb3c81e0fe97e9a5b325409ef8ba2ce
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2025-05-23 23:32:05 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2025-05-23 23:32:05 +0000
bsd.suffixes-extra.mk: rewrap long lines
Group CFLAGS variables together either on one line or all separate
depending on length.
Reviewed by: jhb
Sponsored by: DARPA, AFRL
Differential Revision: https://reviews.freebsd.org/D50463
---
share/mk/bsd.suffixes-extra.mk | 49 +++++++++++++++++++++++++++++++-----------
1 file changed, 36 insertions(+), 13 deletions(-)
diff --git a/share/mk/bsd.suffixes-extra.mk b/share/mk/bsd.suffixes-extra.mk
index 629c3177cec7..680abfc88eb4 100644
--- a/share/mk/bsd.suffixes-extra.mk
+++ b/share/mk/bsd.suffixes-extra.mk
@@ -11,32 +11,47 @@ PICFLAG?=-fpic
PIEFLAG?=-fpie
.c.pico:
- ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o
${.TARGET}
+ ${CC} ${PICFLAG} -DPIC \
+ ${SHARED_CFLAGS} ${CFLAGS} \
+ -c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.c.nossppico:
- ${CC} ${PICFLAG} -DPIC
${SHARED_CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//}
${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//}
-c ${.IMPSRC} -o ${.TARGET}
+ ${CC} ${PICFLAG} -DPIC \
+
${SHARED_CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//}
\
+
${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//}
\
+ -c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.c.pieo:
- ${CC} ${PIEFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o
${.TARGET}
+ ${CC} ${PIEFLAG} -DPIC \
+ ${SHARED_CFLAGS} ${CFLAGS} \
+ -c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.cc.pico .C.pico .cpp.pico .cxx.pico:
- ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o
${.TARGET}
+ ${CXX} ${PICFLAG} -DPIC \
+ ${SHARED_CXXFLAGS} ${CXXFLAGS} \
+ -c ${.IMPSRC} -o ${.TARGET}
.cc.nossppico .C.nossppico .cpp.nossppico .cxx.nossppico:
- ${CXX} ${PICFLAG} -DPIC
${SHARED_CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//}
${CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//}
-c ${.IMPSRC} -o ${.TARGET}
+ ${CXX} ${PICFLAG} -DPIC \
+
${SHARED_CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//}
\
+
${CXXFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//:C/^-fsanitize.*$//}
\
+ -c ${.IMPSRC} -o ${.TARGET}
.cc.pieo .C.pieo .cpp.pieo .cxx.pieo:
- ${CXX} ${PIEFLAG} ${SHARED_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o
${.TARGET}
+ ${CXX} ${PIEFLAG} ${SHARED_CXXFLAGS} ${CXXFLAGS} \
+ -c ${.IMPSRC} -o ${.TARGET}
.f.pico:
${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
${CTFCONVERT_CMD}
.f.nossppico:
- ${FC} ${PICFLAG} -DPIC
${FFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} -o
${.TARGET} -c ${.IMPSRC}
+ ${FC} ${PICFLAG} -DPIC \
+
${FFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \
+ -o ${.TARGET} -c ${.IMPSRC}
${CTFCONVERT_CMD}
.s.pico .s.nossppico .s.pieo:
@@ -45,31 +60,39 @@ PIEFLAG?=-fpie
.asm.pico:
${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PICFLAG} -DPIC \
- ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ ${CFLAGS} ${ACFLAGS} \
+ -c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.asm.nossppico:
${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PICFLAG} -DPIC \
-
${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} ${ACFLAGS}
-c ${.IMPSRC} -o ${.TARGET}
+
${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \
+ ${ACFLAGS} \
+ -c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.asm.pieo:
${CC:N${CCACHE_BIN}} -x assembler-with-cpp ${PIEFLAG} -DPIC \
- ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+ ${CFLAGS} ${ACFLAGS} \
+ -c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.S.pico:
- ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \
+ ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC \
+ ${CFLAGS} ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.S.nossppico:
- ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC
${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} ${ACFLAGS}
\
+ ${CC:N${CCACHE_BIN}} ${PICFLAG} -DPIC \
+
${CFLAGS:C/^-fstack-protector.*$//:C/^-fstack-clash-protection.*$//} \
+ ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
.S.pieo:
- ${CC:N${CCACHE_BIN}} ${PIEFLAG} -DPIC ${CFLAGS} ${ACFLAGS} \
+ ${CC:N${CCACHE_BIN}} ${PIEFLAG} -DPIC \
+ ${CFLAGS} ${ACFLAGS} \
-c ${.IMPSRC} -o ${.TARGET}
${CTFCONVERT_CMD}
