fix: starsim: Add -fcommon flag to overwrite new default in gcc

star-bnl · Jun 24, 2022 · 7d5fd7f · 7d5fd7f
1 parent 4eeac85
commit 7d5fd7f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/asps/Simulation/starsim/Conscript b/asps/Simulation/starsim/Conscript
@@ -90,7 +90,7 @@ $CPPPATH .= $main::PATH_SEPARATOR . "#asps/Simulation/starsim/include";
 $CPPPATH .= $main::PATH_SEPARATOR . $env->{Packages}->{MYSQL}->{INCDIR}; 
 $CPPPATH .= $main::PATH_SEPARATOR . $env->{ENV}->{CERN_ROOT} . "/include";
 $CPPPATH .= $main::PATH_SEPARATOR . $env->{ENV}->{CERN_ROOT} . "/src/pawlib/paw/ntuple";
-$CPPFLAGS  = "-fcommon -DCERNLIB_DZDOC -DCERNLIB_NONEWL -DCERNLIB_SHL -DCERNLIB_HADRON -DCERNLIB_BSLASH -DCERNLIB_HIGZ -DCERNLIB_CG";
+$CPPFLAGS  = "-DCERNLIB_DZDOC -DCERNLIB_NONEWL -DCERNLIB_SHL -DCERNLIB_HADRON -DCERNLIB_BSLASH -DCERNLIB_HIGZ -DCERNLIB_CG";
 
 if ($STAR_SYS =~ /^rh/ or $STAR_SYS =~ /^sl/ or $STAR_SYS =~ /^i386/) {
   # $FPPFLAGS .= " -DCERNLIB_MYSQL -DCERNLIB_QMGLIBC";
@@ -123,6 +123,7 @@ $env2 = $env->clone('FC'           => $FC,
 		    'FCPATH'       => $FCPATH,
 		    'FEXTEND'      => "",
 		    'FDEBUG'       => $FDEBUG,
+		    'CFLAGS'       => "$env->{CFLAGS} -fcommon",
 		    'CPPFLAGS'     => $CPPFLAGS,
 		    'CPPPATH'      => $CPPPATH,
 		    'DEBUG'        => $DEBUG,