Skip to content

Commit

Permalink
Removing MSVC more
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-schwarz committed Nov 28, 2021
1 parent 68a9cfa commit bf79f1b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 46 deletions.
26 changes: 1 addition & 25 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -3470,30 +3470,7 @@ test -n "$target_alias" &&
DEFAULT_COMPILER=_GNUCC
DEFAULT_CIL_MODE=GNUCC

# is the microsoft compiler available?
# hmm.. I think we should check the version or something, because
# sometimes people have Common Lisp's interpreter called 'cl' ..
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for msvc cl.exe (optional)" >&5
printf %s "checking for msvc cl.exe (optional)... " >&6; }
# See if CC points to the MS compiler
if "$CC" 2>&1 | grep "Microsoft" >/dev/null; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found, set as default" >&5
printf "%s\n" "found, set as default" >&6; }
HAS_MSVC=yes
DEFAULT_COMPILER=_MSVC
DEFAULT_CIL_MODE=MSVC
CFLAGS="-WX"
else
if cl 2>&1 | grep "Microsoft" >/dev/null ;then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5
printf "%s\n" "found" >&6; }
HAS_MSVC=yes
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
printf "%s\n" "not found" >&6; }
HAS_MSVC=no
fi
fi
HAS_MSVC=no

# ------------------- OCaml ----------------

Expand Down Expand Up @@ -7433,7 +7410,6 @@ fi
cat <<EOF
CIL configuration:
(optional) cl.exe found: HAS_MSVC $HAS_MSVC
gcc to use CC $CC
default compiler DEFAULT_COMPILER $DEFAULT_COMPILER
CIL version CIL_VERSION $CIL_VERSION
Expand Down
22 changes: 1 addition & 21 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -82,26 +82,7 @@ AC_EXEEXT
DEFAULT_COMPILER=_GNUCC
DEFAULT_CIL_MODE=GNUCC

# is the microsoft compiler available?
# hmm.. I think we should check the version or something, because
# sometimes people have Common Lisp's interpreter called 'cl' ..
AC_MSG_CHECKING(for msvc cl.exe (optional))
# See if CC points to the MS compiler
if "$CC" 2>&1 | grep "Microsoft" >/dev/null; then
AC_MSG_RESULT([found, set as default])
HAS_MSVC=yes
DEFAULT_COMPILER=_MSVC
DEFAULT_CIL_MODE=MSVC
CFLAGS="-WX"
else
if cl 2>&1 | grep "Microsoft" >/dev/null ;then
AC_MSG_RESULT(found)
HAS_MSVC=yes
else
AC_MSG_RESULT(not found)
HAS_MSVC=no
fi
fi
HAS_MSVC=no

# ------------------- OCaml ----------------

Expand Down Expand Up @@ -216,7 +197,6 @@ AC_OUTPUT
cat <<EOF
CIL configuration:
(optional) cl.exe found: HAS_MSVC $HAS_MSVC
gcc to use CC $CC
default compiler DEFAULT_COMPILER $DEFAULT_COMPILER
CIL version CIL_VERSION $CIL_VERSION
Expand Down

0 comments on commit bf79f1b

Please sign in to comment.