Skip to content

Commit

Permalink
gac: remove -r and last traces of -fFEATURE
Browse files Browse the repository at this point in the history
The -r option was the only reason for referencing abs_top_srcdir, and nothing
seems to use it. I can't think of any reason for using it either, other than
perhaps convenience when invoking this manually (instead of via a build script).

The -f options like -ffast-int-arith were removed in 2017 without complaints
since then, so we can safely remove the last vestiges of them now.
  • Loading branch information
fingolfin committed Jan 10, 2022
1 parent bb7065c commit 227fb92
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions cnf/gac.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
##
#W gac, the GAP compiler
##
## gac [-d] [-c|-C] [-o <output>] {-f<option>} <input>...
## gac [-d] [-c|-C] [-o <output>] <input>...
##
## 'gac' compiles the input files. Input files must be GAP source code
## (suffix '.g' or '.gap'), C source code (suffix '.c'), or compiled code
Expand All @@ -30,10 +30,6 @@
## If '-C is given, then 'gac' only compiles the input files to C code, which
## will require compilation and linking to be usable.
##
## If '-r' is given, then statically compiled files will be assumed to be given
## by pathnames relative to the GAP root, and will be compiled for automatic loading
## when files are sought relative to the GAP root.
##
## The option '-o <output>' tells 'gac' to name the output file <output>.
##
## The option '-save-temps' tells 'gac' to not delete any intermediate files
Expand All @@ -56,9 +52,6 @@
# absolute path of the directory in which GAP was compiled
abs_top_builddir="@abs_top_builddir@"

# path of the directory the GAP sources contained in
abs_top_srcdir="@abs_top_srcdir@"

#
libdir="@libdir@"

Expand Down Expand Up @@ -251,10 +244,6 @@ process_gap_file () {
gap_compile_name=$input
if [ $comp_mode = "comp_static" ]; then
gap_compile_id=Init_${name}
if [ $comp_static_root_relative = "yes" ]; then
gap_compile_in=${abs_top_srcdir}/$input;
gap_compile_name=GAPROOT/$input;
fi
else
gap_compile_id=Init_Dynamic
fi
Expand Down Expand Up @@ -290,13 +279,12 @@ trap "clean_up" 2 3
## parse the arguments
##
if [ $# = 0 ]; then
echo "usage: $0 [-d|-r] [-c|-C] [-o <output>] <input>..."
echo "usage: $0 [-d] [-c|-C] [-o <output>] <input>..."
exit 1
fi

comp_mode="comp_static"
comp_howfar="link"
comp_static_root_relative="no"
output=""
inputs=""
savetemps="false"
Expand All @@ -312,13 +300,8 @@ while [ $# -gt 0 ]; do

-o|--output) shift; output="$1";;

-r) comp_static_root_relative="yes";;

-save-temps) savetemps="true";;

-f*) echo "$0: no such option '$1'"
exit 1;;

-k|--gap-compiler) shift; gap_compiler="$1";;

-p) shift;
Expand Down

0 comments on commit 227fb92

Please sign in to comment.