Changeset 12415 for utils/build/maketools

Timestamp:

2020-02-19T21:29:26+01:00 (4 years ago)

Author:

smueller

Message:

Reintegration of 2019 development branch ^{/utils/build_MERGE_2019 into the build directory (}/utils/build)

File:

• utils/build/maketools (modified) (2 diffs)

utils/build/maketools

@@ -145 +145 @@
 [ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit
 
-#- When used for the first time, choose a compiler ---
-. ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm cpp.fcm ${CMP_NAM} || exit
-
 #- Choose a default tool if needed ---
 #- REBUILD or last one used ---
@@ -156 +153 @@
 
 #- Make the building directory
-. ${COMPIL_DIR}/Fmake_bld.sh ${TOOLS_DIR} ${NEW_CONF} ${NEMO_TDIR} || exit
+. ${COMPIL_DIR}/Fmake_tools_bld.sh ${TOOLS_DIR} ${NEW_CONF} ${NEMO_TDIR} || exit
+
+#- At this stage cpp keys have been updated. we can check the arch file
+#- When used for the first time, choose a compiler ---
+. ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm cpp_tools.fcm ${CMP_NAM} || exit
 
 #-