diff --git a/asps/Simulation/starsim/Conscript b/asps/Simulation/starsim/Conscript index 0da6aafb1df..5100171907f 100644 --- a/asps/Simulation/starsim/Conscript +++ b/asps/Simulation/starsim/Conscript @@ -123,10 +123,10 @@ $env2 = $env->clone('FC' => $FC, 'FCPATH' => $FCPATH, 'FEXTEND' => "", 'FDEBUG' => $FDEBUG, + 'CFLAGS' => "$env->{CFLAGS} -fcommon", 'CPPFLAGS' => $CPPFLAGS, 'CPPPATH' => $CPPPATH, 'DEBUG' => $DEBUG, - 'AGETOFLAGS' => "", 'LIBS' => $LIBS, 'ObjDir' => $obj_dir, 'Libraries' => $Libraries diff --git a/asps/rexe/Conscript b/asps/rexe/Conscript index 1c87ae344f2..4f23f7a4317 100644 --- a/asps/rexe/Conscript +++ b/asps/rexe/Conscript @@ -79,9 +79,7 @@ if ($FC =~ /^pgf/) { } $LIBS .= " -lgeant321 -lgcalor"; $LIBS .= " " . $env->{CERNLIBS}; -$LIBS .= $env->{LDALL}; $LIBS .= " " . $env->{Packages}->{MYSQL}->{LIBS}; -$LIBS .= $env->{LDNONE}; $LIBS .= " " . $FLIBS . " " . $env->{CLIBS};# " " . $env->{SYSLIBS} ; if ($STAR_SYS =~ /^sun4x_5.$/) { if ($LIBPATH) { $LIBPATH .= $main::PATH_SEPARATOR; }