Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed duplicate entries in compile line for h5* compiler wrappers #4360

Merged
merged 11 commits into from
Apr 10, 2024
Merged

Removed duplicate entries in compile line for h5* compiler wrappers #4360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f96a076
h5fc remove duplicate args
brtnfld Apr 9, 2024
f97b950
h5 wrappers remove duplicate args
brtnfld Apr 9, 2024
10df85e
format clean-up
brtnfld Apr 9, 2024
d3bfa81
fixed qarg
brtnfld Apr 9, 2024
3af91b2
reworked duplicate fix
brtnfld Apr 9, 2024
51b1027
remove misc_args
brtnfld Apr 9, 2024
9b4962f
revert c changes
brtnfld Apr 9, 2024
5d317a4
minor change
brtnfld Apr 9, 2024
88d72b5
fixed linking issue
brtnfld Apr 9, 2024
990cb5e
typo
brtnfld Apr 9, 2024
7d4c082
typo
brtnfld Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions bin/h5cc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ host_os="@host_os@"

prog_name="`basename $0`"

misc_args=""
qargs=""
compile_args=""
libraries=""
link_args=""
Expand All @@ -71,8 +71,7 @@ clibpath=""

do_link="yes"
do_compile="no"
dash_o="no"
dash_c="no"
dash_c=""
get_output_file="no"

SHOW="eval"
Expand Down Expand Up @@ -209,12 +208,10 @@ for arg in $@ ; do
fi

do_link="no"
dash_c="yes"
dash_c="-c"
;;
-o)
dash_o="yes"

if test "x$dash_c" = "xyes"; then
if test "x$dash_c" = "x-c"; then
compile_args="$compile_args $arg"
else
link_args="$link_args $arg"
Expand All @@ -224,7 +221,7 @@ for arg in $@ ; do
;;
-E|-M|-MT)
compile_args="$compile_args $arg"
dash_c="yes"
dash_c="-c"
do_link="no"
;;
-l*)
Expand Down Expand Up @@ -260,15 +257,13 @@ for arg in $@ ; do
;;
*\"*)
qarg="'"$arg"'"
misc_args="$misc_args $qarg"
qargs="$qargs $qarg"
;;
*\'*)
qarg='"'"$arg"'"'
misc_args="$misc_args $qarg"
qargs="$qargs $qarg"
;;
*)
misc_args="$misc_args $qarg"

if test -s "$arg"; then
ext=`expr "$arg" : '.*\(\..*\)'`

Expand All @@ -278,7 +273,7 @@ for arg in $@ ; do
fname=`basename $arg .c`
link_objs="$link_objs $fname.o"
elif test "x$ext" = "x.o"; then
if test "x$dash_c" = "xyes"; then
if test "x$dash_c" = "x-c"; then
compile_args="$compile_args $arg"
else
do_link="yes"
Expand All @@ -298,18 +293,17 @@ for arg in $@ ; do
;;
esac
done

if test "$dash_c" = "yes" -a "$do_compile" = no -a "$do_link" = no ; then
link_args="$link_args $qargs"
if test "$dash_c" = "-c" -a "$do_compile" = no -a "$do_link" = no ; then
# -c was specified. Force do_compile on.
do_compile=yes
fi

if test "x$do_compile" = "xyes"; then
if test "x$dash_c" != "xyes"; then
compile_args="-c $compile_args"
if test "x$dash_c" = "x"; then
dash_c="-c"
fi

$SHOW $CC -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $misc_args $compile_args
$SHOW $CC -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $dash_c $qargs $compile_args
status=$?

if test "$status" != "0"; then
Expand Down
84 changes: 38 additions & 46 deletions c++/src/h5c++.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ host_os="@host_os@"

prog_name="`basename $0`"

misc_args=""
qargs=""
compile_args=""
libraries=""
link_args=""
Expand All @@ -69,8 +69,7 @@ clibpath=""

do_link="yes"
do_compile="no"
dash_o="no"
dash_c="no"
dash_c=""
get_output_file="no"

SHOW="eval"
Expand Down Expand Up @@ -205,12 +204,10 @@ for arg in $@ ; do
fi

do_link="no"
dash_c="yes"
dash_c="-c"
;;
-o)
dash_o="yes"

if test "x$dash_c" = "xyes"; then
if test "x$dash_c" = "x-c"; then
compile_args="$compile_args $arg"
else
link_args="$link_args $arg"
Expand All @@ -220,7 +217,7 @@ for arg in $@ ; do
;;
-E|-M|-MT)
compile_args="$compile_args $arg"
dash_c="yes"
dash_c="-c"
do_link="no"
;;
-l*)
Expand Down Expand Up @@ -250,53 +247,48 @@ for arg in $@ ; do
;;
*\"*)
qarg="'"$arg"'"
misc_args="$misc_args $qarg"
qargs="$qargs $qarg"
;;
*\'*)
qarg='"'"$arg"'"'
misc_args="$misc_args $qarg"
qargs="$qargs $qarg"
;;

*)
misc_args="$misc_args $qarg"

if [ -s "$arg" ] ; then
ext=`expr "$arg" : '.*\(\..*\)'`
if [ "$ext" = ".C" -o "$ext" = ".cxx" -o "$ext" = ".cpp" -o \
"$ext" = ".cc" -o "$ext" = ".c" -o "$ext" = ".CC" ] ; then

do_compile="yes"
compile_args="$compile_args $arg"
fname=`basename $arg $ext`
link_objs="$link_objs $fname.o"
elif [ "$ext" = ".o" ] ; then
if test "x$dash_c" = "xyes" ; then
compile_args="$compile_args $arg"
else
do_link="yes"
link_objs="$link_objs $arg"
fi
elif test "x$ext" = "x.a"; then
# This is an archive that we're linking in
libraries=" $libraries $arg "
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
fi
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
fi
;;
if [ -s "$arg" ] ; then
ext=`expr "$arg" : '.*\(\..*\)'`
if [ "$ext" = ".C" -o "$ext" = ".cxx" -o "$ext" = ".cpp" -o \
"$ext" = ".cc" -o "$ext" = ".c" -o "$ext" = ".CC" ] ; then
do_compile="yes"
compile_args="$compile_args $arg"
fname=`basename $arg $ext`
link_objs="$link_objs $fname.o"
elif [ "$ext" = ".o" ] ; then
if test "x$dash_c" = "x-c" ; then
compile_args="$compile_args $arg"
else
do_link="yes"
link_objs="$link_objs $arg"
fi
elif test "x$ext" = "x.a"; then
# This is an archive that we're linking in
libraries=" $libraries $arg "
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
fi
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
fi
;;
esac
done

link_args="$link_args $qargs"
if test "x$do_compile" = "xyes"; then
if test "x$dash_c" != "xyes"; then
compile_args="-c $compile_args"
if test "x$dash_c" = "x"; then
dash_c="-c"
fi

$SHOW $CXX -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $misc_args $compile_args
$SHOW $CXX -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $dash_c $qargs $compile_args
status=$?

if test "$status" != "0"; then
Expand Down
94 changes: 44 additions & 50 deletions fortran/src/h5fc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,14 @@ host_os="@host_os@"

prog_name="`basename $0`"

misc_args=""
qargs=""
compile_args=""
link_args=""
link_objs=""

do_link="yes"
do_compile="no"
dash_o="no"
dash_c="no"
dash_c=""
get_output_file="no"

SHOW="eval"
Expand Down Expand Up @@ -183,12 +182,10 @@ for arg in $@ ; do
fi

do_link="no"
dash_c="yes"
dash_c="-c"
;;
-o)
dash_o="yes"

if test "x$dash_c" = "xyes"; then
if test "x$dash_c" = "x-c"; then
compile_args="$compile_args $arg"
else
link_args="$link_args $arg"
Expand All @@ -198,7 +195,7 @@ for arg in $@ ; do
;;
-E|-M|-MT)
compile_args="$compile_args $arg"
dash_c="yes"
dash_c="-c"
do_link="no"
;;
-l*)
Expand Down Expand Up @@ -234,62 +231,59 @@ for arg in $@ ; do
;;
*\"*)
qarg="'"$arg"'"
misc_args="$misc_args $qarg"
qargs="$qargs $qarg"
;;
*\'*)
qarg='"'"$arg"'"'
misc_args="$misc_args $qarg"
qargs="$qargs $qarg"
;;
*)
if [ -s "$arg" ] ; then
ext=`expr "$arg" : '.*\(\..*\)'`
if [ "$ext" = ".f" -o "$ext" = ".F" -o \
"$ext" = ".for" -o "$ext" = ".FOR" -o \
"$ext" = ".ftn" -o "$ext" = ".FTN" -o \
"$ext" = ".f90" -o "$ext" = ".F90" -o \
"$ext" = ".f95" -o "$ext" = ".F95" -o \
"$ext" = ".f03" -o "$ext" = ".F03" -o \
"$ext" = ".f08" -o "$ext" = ".F08" ] ; then
do_compile="yes"
compile_args="$compile_args $arg"
fname=`basename $arg $ext`
link_objs="$link_objs $fname.o"
elif [ "$ext" = ".o" ] ; then
if test "x$dash_c" = "x-c" ; then
compile_args="$compile_args $arg"
else
do_link="yes"
link_objs="$link_objs $arg"
fi
elif test "x$ext" = "x.a"; then
# This is an archive that we're linking in
libraries=" $libraries $arg "
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
fi
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
fi
;;

*) misc_args="$misc_args $arg"
if [ -s "$arg" ] ; then
ext=`expr "$arg" : '.*\(\..*\)'`
if [ "$ext" = ".f" -o "$ext" = ".F" -o \
"$ext" = ".for" -o "$ext" = ".FOR" -o \
"$ext" = ".ftn" -o "$ext" = ".FTN" -o \
"$ext" = ".f90" -o "$ext" = ".F90" -o \
"$ext" = ".f95" -o "$ext" = ".F95" -o \
"$ext" = ".f03" -o "$ext" = ".F03" -o \
"$ext" = ".f08" -o "$ext" = ".F08" ] ; then
do_compile="yes"
compile_args="$compile_args $arg"
fname=`basename $arg $ext`
link_objs="$link_objs $fname.o"
elif [ "$ext" = ".o" ] ; then
if test "x$dash_c" = "xyes" ; then
compile_args="$compile_args $arg"
else
do_link="yes"
link_objs="$link_objs $arg"
fi
elif test "x$ext" = "x.a"; then
# This is an archive that we're linking in
libraries=" $libraries $arg "
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
fi
else
compile_args="$compile_args $arg"
link_args="$link_args $arg"
fi
;;
esac
done

link_args="$link_args $qargs"
# It's possible that there isn't a modules flag...
fmodules=""
if test -n "$F9XMODFLAG"; then
fmodules="${F9XMODFLAG}${fmoddir}"
fi

if test "x$do_compile" = "xyes"; then
if test "x$dash_c" != "xyes"; then
compile_args="-c $compile_args"
if test "x$dash_c" = "x"; then
dash_c="-c"
fi


$SHOW $FC $H5BLD_FCFLAGS $FCFLAGS ${F9XSUFFIXFLAG} ${fmodules} $misc_args $compile_args
$SHOW $FC $H5BLD_FCFLAGS $FCFLAGS ${F9XSUFFIXFLAG} ${fmodules} $dash_c $qargs $compile_args
status=$?

if test "$status" != "0"; then
Expand Down
Loading