Merge from mainline for PR2886. (1827f380) · Commits · llvm-doe / llvm-project

llvm/autoconf/configure.ac

+4 −4

Original line number	Diff line number	Diff line
		@@ -610,10 +610,10 @@ AC_PATH_PROG(POD2MAN, [pod2man])
		AC_PATH_PROG(RUNTEST, [runtest])
		DJ_AC_PATH_TCLSH
		AC_PATH_PROG(ZIP, [zip])
		AC_PATH_PROGS(OCAMLC, [ocamlc.opt ocamlc])
		AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt])
		AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep])
		AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc])
		AC_PATH_PROGS(OCAMLC, [ocamlc])
		AC_PATH_PROGS(OCAMLOPT, [ocamlopt])
		AC_PATH_PROGS(OCAMLDEP, [ocamldep])
		AC_PATH_PROGS(OCAMLDOC, [ocamldoc])

		dnl Determine if the linker supports the -R option.
		AC_LINK_USE_R

+4 −4

Original line number	Diff line number	Diff line
		@@ -8139,7 +8139,7 @@ echo "${ECHO_T}no" >&6; }
		fi


		for ac_prog in ocamlc.opt ocamlc
		for ac_prog in ocamlc
		do
		# Extract the first word of "$ac_prog", so it can be a program name with args.
		set dummy $ac_prog; ac_word=$2
		@@ -8184,7 +8184,7 @@ fi
		test -n "$OCAMLC" && break
		done

		for ac_prog in ocamlopt.opt ocamlopt
		for ac_prog in ocamlopt
		do
		# Extract the first word of "$ac_prog", so it can be a program name with args.
		set dummy $ac_prog; ac_word=$2
		@@ -8229,7 +8229,7 @@ fi
		test -n "$OCAMLOPT" && break
		done

		for ac_prog in ocamldep.opt ocamldep
		for ac_prog in ocamldep
		do
		# Extract the first word of "$ac_prog", so it can be a program name with args.
		set dummy $ac_prog; ac_word=$2
		@@ -8274,7 +8274,7 @@ fi
		test -n "$OCAMLDEP" && break
		done

		for ac_prog in ocamldoc.opt ocamldoc
		for ac_prog in ocamldoc
		do
		# Extract the first word of "$ac_prog", so it can be a program name with args.
		set dummy $ac_prog; ac_word=$2

+1 −1

Original line number	Diff line number	Diff line
		(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma %s -o %t
		(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma %s -o %t 2> /dev/null
		* RUN: ./%t %t.bc
		*)

+1 −1

Original line number	Diff line number	Diff line
		(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitreader.cma llvm_bitwriter.cma %s -o %t
		(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitreader.cma llvm_bitwriter.cma %s -o %t 2> /dev/null
		* RUN: ./%t %t.bc
		* RUN: llvm-dis < %t.bc \| grep caml_int_ty
		*)

+1 −1

Original line number	Diff line number	Diff line
		(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitwriter.cma %s -o %t
		(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitwriter.cma %s -o %t 2> /dev/null
		* RUN: ./%t %t.bc
		* RUN: llvm-dis < %t.bc \| grep caml_int_ty
		*)