Changeset 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/COMPILE/conv.cfg

Timestamp:

2018-10-29T15:20:26+01:00 (5 years ago)

Author:

kingr

Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:

• branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/COMPILE/conv.cfg (modified) (2 diffs)

branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/TOOLS/COMPILE/conv.cfg

@@ -8 +8 @@
 # Build information
 # ------------------------------------------------------------------------------
-inc $COMPIL_DIR/arch_nemo.fcm
+inc $COMPIL_DIR/arch.fcm
 
-bld::tool::cc        %CC
-bld::tool::cflags    %CFLAGS
 bld::tool::make      %MK
 
@@ -21 +19 @@
 dir::root            $NEMO_TDIR/$NEW_CONF/AGRIFLIB
 
-#bld::tool::cflags::convsrc  -O0  
-#bld::tool::ld::convsrc   cc
-#bld::tool::ldflags::convsrc -O  ../obj/fortran.o ../obj/fortran.o 
-#bld::pp 1
+bld::tool::cflags::convsrc  -O0  
+bld::tool::ld::convsrc   cc
+bld::tool::ldflags::convsrc -O  ../obj/fortran.o ../obj/fortran.o 
+bld::pp 1