Changeset 11985 for utils/build

Timestamp:

2019-11-27T15:01:24+01:00 (4 years ago)

Author:

mathiot

Message:

mk_ENHANCE-03_domcfg: fix issue when compiling tools without cpp_TOOLS.fcm file

File:

• utils/build/mk_ENHANCE-03_domcfg/Fmake_tools_bld.sh (modified) (1 diff)

utils/build/mk_ENHANCE-03_domcfg/Fmake_tools_bld.sh

@@ -61 +61 @@
 [ ! -d ${3}/${2}/BLD ] && \mkdir ${3}/${2}/BLD
 [ ! -d ${1}/${2}/BLD ] && ln -sf ${3}/${2}/BLD ${1}/${2}/BLD
-[ -f ${1}/${NEW_CONF}/cpp_${NEW_CONF}.fcm ] && ln -sf ${1}/${NEW_CONF}/cpp_${NEW_CONF}.fcm ${COMPIL_DIR}/cpp_tools.fcm
+# enforce presence of cpp_tools.fcm (write a blank one if not present in the tools directory)
+# cp instead of ln to avoid overwiting previous tool cpp_XXX.fcm file when compiling a file without cpp_YYY.fcm file.
+[ -f ${1}/${NEW_CONF}/cpp_${NEW_CONF}.fcm ] && cp -f ${1}/${NEW_CONF}/cpp_${NEW_CONF}.fcm ${COMPIL_DIR}/cpp_tools.fcm || echo 'bld::tool::fppkeys ' > ${COMPIL_DIR}/cpp_tools.fcm
 rm -f  ${1}/${NEW_CONF}/BLD/fcm.bld.lock