Commit 3d40b89824f43e44434db0ac5bbf07cd657c1a5b
2024-03-28T16:21:05
config.subr: report linker errors
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
diff --git a/config.subr b/config.subr
index a74a94d..6949efd 100644
--- a/config.subr
+++ b/config.subr
@@ -494,44 +494,52 @@ update_build_lib() {
LD_DEBUG=.build/ld_debug.tmp
mkdir -p .build
+ LINK="${LIBTOOL} --tag=CC --mode=link"
+ LINK="$LINK \${CC} -shared \${LDFLAGS} \${OBJECTS} \${LIBS}"
+ LINK="$LINK -rpath ${LIBDIR} -o \"\$1\""
+
echo "#!/bin/sh" >> ${LD_ASAN}
echo "# gen by configure" >> ${LD_ASAN}
+ echo "LOG=\".build/\$1.asan.log\"" >> ${LD_ASAN}
echo "CC=\"${CC}\"" >> ${LD_ASAN}
echo "LDFLAGS=\"${LDFLAGS_ASAN}\"" >> ${LD_ASAN}
echo "OBJECTS=\"${OBJECTS_ASAN}\"" >> ${LD_ASAN}
echo "LIBS=\"${LIBS_ASAN}\"" >> ${LD_ASAN}
echo >> ${LD_ASAN}
- echo "${LIBTOOL} --tag=CC --mode=link \${CC} -shared \${LDFLAGS} \${OBJECTS} \${LIBS} -rpath ${LIBDIR} -o \"\$1\" >> .build/log 2>&1" >> ${LD_ASAN}
+ echo "$LINK > \"\$LOG\" 2>&1 || $LINK" >> ${LD_ASAN}
update_and_chmod 755 ${LD_ASAN} .build/ld_asan
echo "#!/bin/sh" >> ${LD_COV}
echo "# gen by configure" >> ${LD_COV}
+ echo "LOG=\".build/\$1.cov.log\"" >> ${LD_COV}
echo "CC=\"${CC}\"" >> ${LD_COV}
echo "LDFLAGS=\"${LDFLAGS_COV}\"" >> ${LD_COV}
echo "OBJECTS=\"${OBJECTS_COV}\"" >> ${LD_COV}
echo "LIBS=\"${LIBS_COV}\"" >> ${LD_COV}
echo >> ${LD_COV}
- echo "${LIBTOOL} --tag=CC --mode=link \${CC} -shared \${LDFLAGS} \${OBJECTS} \${LIBS} -rpath ${LIBDIR} -o \"\$1\" >> .build/log 2>&1" >> ${LD_COV}
+ echo "$LINK > \"\$LOG\" 2>&1 || $LINK" >> ${LD_COV}
update_and_chmod 755 ${LD_COV} .build/ld_cov
echo "#!/bin/sh" >> ${LD_DEBUG}
echo "# gen by configure" >> ${LD_DEBUG}
+ echo "LOG=\".build/\$1.debug.log\"" >> ${LD_DEBUG}
echo "CC=\"${CC}\"" >> ${LD_DEBUG}
echo "LDFLAGS=\"${LDFLAGS_DEBUG}\"" >> ${LD_DEBUG}
echo "OBJECTS=\"${OBJECTS_DEBUG}\"" >> ${LD_DEBUG}
echo "LIBS=\"${LIBS_DEBUG}\"" >> ${LD_DEBUG}
echo >> ${LD_DEBUG}
- echo "${LIBTOOL} --tag=CC --mode=link \${CC} -shared \${LDFLAGS} \${OBJECTS} \${LIBS} -rpath ${LIBDIR} -o \"\$1\" >> .build/log 2>&1" >> ${LD_DEBUG}
+ echo "$LINK > \"\$LOG\" 2>&1 || $LINK" >> ${LD_DEBUG}
update_and_chmod 755 ${LD_DEBUG} .build/ld_debug
echo "#!/bin/sh" >> ${LD_MAIN}
echo "# gen by configure" >> ${LD_MAIN}
+ echo "LOG=\".build/\$1.main.log\"" >> ${LD_MAIN}
echo "CC=\"${CC}\"" >> ${LD_MAIN}
echo "LDFLAGS=\"${LDFLAGS}\"" >> ${LD_MAIN}
echo "OBJECTS=\"${OBJECTS}\"" >> ${LD_MAIN}
echo "LIBS=\"${LIBS}\"" >> ${LD_MAIN}
echo >> ${LD_MAIN}
- echo "${LIBTOOL} --tag=CC --mode=link \${CC} -shared \${LDFLAGS} \${OBJECTS} \${LIBS} -rpath ${LIBDIR} -o \"\$1\" >> .build/log 2>&1" >> ${LD_MAIN}
+ echo "$LINK > \"\$LOG\" 2>&1 || $LINK" >> ${LD_MAIN}
update_and_chmod 755 ${LD_MAIN} .build/ld_main
}
@@ -582,48 +590,56 @@ update_build_prog() {
LD_DEBUG=.build/ld_debug.tmp
mkdir -p .build
+ LINK="${LIBTOOL} --tag=CC --mode=link"
+ LINK="$LINK \${CC} \${CFLAGS} \${LDFLAGS} \${OBJECTS} \${LIBS}"
+ LINK="$LINK -o \"\$1\""
+
echo "#!/bin/sh" >> ${LD_ASAN}
echo "# gen by configure" >> ${LD_ASAN}
+ echo "LOG=\".build/\$1.asan.log\"" >> ${LD_ASAN}
echo "CC=\"${CC}\"" >> ${LD_ASAN}
echo "CFLAGS=\"${CFLAGS_ASAN}\"" >> ${LD_ASAN}
echo "LDFLAGS=\"${LDFLAGS_ASAN}\"" >> ${LD_ASAN}
echo "OBJECTS=\"${OBJECTS_ASAN}\"" >> ${LD_ASAN}
echo "LIBS=\"${LIBS_ASAN}\"" >> ${LD_ASAN}
echo >> ${LD_ASAN}
- echo "${LIBTOOL} --tag=CC --mode=link \${CC} \${CFLAGS} \${LDFLAGS} \${OBJECTS} \${LIBS} -o \"\$1\" >> .build/log 2>&1" >> ${LD_ASAN}
+ echo "$LINK > \"\$LOG\" 2>&1 || $LINK" >> ${LD_ASAN}
update_and_chmod 755 ${LD_ASAN} .build/ld_asan
echo "#!/bin/sh" >> ${LD_COV}
echo "# gen by configure" >> ${LD_COV}
+ echo "LOG=\".build/\$1.cov.log\"" >> ${LD_COV}
echo "CC=\"${CC}\"" >> ${LD_COV}
echo "CFLAGS=\"${CFLAGS_ASAN}\"" >> ${LD_COV}
echo "LDFLAGS=\"${LDFLAGS_COV}\"" >> ${LD_COV}
echo "OBJECTS=\"${OBJECTS_COV}\"" >> ${LD_COV}
echo "LIBS=\"${LIBS_COV}\"" >> ${LD_COV}
echo >> ${LD_COV}
- echo "${LIBTOOL} --tag=CC --mode=link \${CC} \${CFLAGS} \${LDFLAGS} \${OBJECTS} \${LIBS} -o \"\$1\" >> .build/log 2>&1" >> ${LD_COV}
+ echo "$LINK > \"\$LOG\" 2>&1 || $LINK" >> ${LD_COV}
update_and_chmod 755 ${LD_COV} .build/ld_cov
echo "#!/bin/sh" >> ${LD_DEBUG}
echo "# gen by configure" >> ${LD_DEBUG}
+ echo "LOG=\".build/\$1.debug.log\"" >> ${LD_DEBUG}
echo "CC=\"${CC}\"" >> ${LD_DEBUG}
echo "CFLAGS=\"${CFLAGS_DEBUG}\"" >> ${LD_DEBUG}
echo "LDFLAGS=\"${LDFLAGS_DEBUG}\"" >> ${LD_DEBUG}
echo "OBJECTS=\"${OBJECTS_DEBUG}\"" >> ${LD_DEBUG}
echo "LIBS=\"${LIBS_DEBUG}\"" >> ${LD_DEBUG}
echo >> ${LD_DEBUG}
- echo "${LIBTOOL} --tag=CC --mode=link \${CC} \${CFLAGS} \${LDFLAGS} \${OBJECTS} \${LIBS} -o \"\$1\" >> .build/log 2>&1" >> ${LD_DEBUG}
+ echo "$LINK > \"\$LOG\" 2>&1 || $LINK" >> ${LD_DEBUG}
update_and_chmod 755 ${LD_DEBUG} .build/ld_debug
echo "#!/bin/sh" >> ${LD_MAIN}
echo "# gen by configure" >> ${LD_MAIN}
+ echo "LOG=\".build/\$1.main.log\"" >> ${LD_MAIN}
echo "CC=\"${CC}\"" >> ${LD_MAIN}
echo "CFLAGS=\"${CFLAGS_DEBUG}\"" >> ${LD_MAIN}
echo "LDFLAGS=\"${LDFLAGS}\"" >> ${LD_MAIN}
echo "OBJECTS=\"${OBJECTS}\"" >> ${LD_MAIN}
echo "LIBS=\"${LIBS}\"" >> ${LD_MAIN}
echo >> ${LD_MAIN}
- echo "${LIBTOOL} --tag=CC --mode=link \${CC} \${CFLAGS} \${LDFLAGS} \${OBJECTS} \${LIBS} -o \"\$1\" >> .build/log 2>&1" >> ${LD_MAIN}
+ echo "$LINK > \"\$LOG\" 2>&1 || $LINK" >> ${LD_MAIN}
update_and_chmod 755 ${LD_MAIN} .build/ld_main
}