Index: kitsh/buildsrc/kitsh-0.0/aclocal.m4 ================================================================== --- kitsh/buildsrc/kitsh-0.0/aclocal.m4 +++ kitsh/buildsrc/kitsh-0.0/aclocal.m4 @@ -189,12 +189,19 @@ continue fi AC_MSG_CHECKING([for libraries required for ${proj}]) - projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | sort | tr "\n" ' '`" - projlibfilesnostub="`find "${projlibdir}" -name '*.a' 2>/dev/null | grep -v 'stub' | tr "\n" ' '`" + projlibfiles="`find "${projlibdir}" -name '*.a' 2>/dev/null | sort`" + projexcludefile="${projlibdir}/kitcreator-nolibs" + if test -e "${projexcludefile}"; then + projexclude="`cat "$projexcludefile"`" + projlibfiles="`echo "$projlibfiles" | egrep -v "$projexclude"`" + fi + + projlibfilesnostub="`echo "$projlibfiles" | grep -v 'stub' | tr "\n" ' '`" + projlibfiles="`echo "$projlibfiles" | tr "\n" ' '`" projlibextra="" for libfile in ${projlibfilesnostub}; do if test -f "${libfile}.linkadd"; then projlibextra="`cat "${libfile}.linkadd"`" Index: tcc4tcl/build.sh ================================================================== --- tcc4tcl/build.sh +++ tcc4tcl/build.sh @@ -118,10 +118,13 @@ done # Create VFS-insert cp -r "${INSTDIR}/lib" "${OUTDIR}" || exit 1 find "${OUTDIR}" -name '*.a' -type f | grep -v '/libtcc1\.a$' | xargs rm -f + + # Tell Kitsh not to try to link against "libtcc1.a" + echo "/libtcc1\.a" > "${INSTDIR}/kitcreator-nolibs" exit 0 ) || exit 1 exit 0