Skip to content

Commit 9a8bae2

Browse files
author
Reid Spencer
committed
Merge from mainline to require Perl for build system.
llvm-svn: 37167
1 parent 9eb9228 commit 9a8bae2

File tree

1 file changed

+27
-24
lines changed

1 file changed

+27
-24
lines changed

‎llvm/configure

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7374,6 +7374,9 @@ fi
73747374
if test x"$PERL" = xnone; then
73757375
HAVE_PERL=0
73767376

7377+
{ { echo "$as_me:$LINENO: error: perl is required but was not found, please install it" >&5
7378+
echo "$as_me: error: perl is required but was not found, please install it" >&2;}
7379+
{ (exit 1); exit 1; }; }
73777380
else
73787381
HAVE_PERL=1
73797382

@@ -10340,7 +10343,7 @@ else
1034010343
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1034110344
lt_status=$lt_dlunknown
1034210345
cat > conftest.$ac_ext <<EOF
10343-
#line 10343 "configure"
10346+
#line 10346 "configure"
1034410347
#include "confdefs.h"
1034510348

1034610349
#if HAVE_DLFCN_H
@@ -12484,7 +12487,7 @@ ia64-*-hpux*)
1248412487
;;
1248512488
*-*-irix6*)
1248612489
# Find out which ABI we are using.
12487-
echo '#line 12487 "configure"' > conftest.$ac_ext
12490+
echo '#line 12490 "configure"' > conftest.$ac_ext
1248812491
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1248912492
(eval $ac_compile) 2>&5
1249012493
ac_status=$?
@@ -14202,11 +14205,11 @@ else
1420214205
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1420314206
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1420414207
-e 's:$: $lt_compiler_flag:'`
14205-
(eval echo "\"\$as_me:14205: $lt_compile\"" >&5)
14208+
(eval echo "\"\$as_me:14208: $lt_compile\"" >&5)
1420614209
(eval "$lt_compile" 2>conftest.err)
1420714210
ac_status=$?
1420814211
cat conftest.err >&5
14209-
echo "$as_me:14209: \$? = $ac_status" >&5
14212+
echo "$as_me:14212: \$? = $ac_status" >&5
1421014213
if (exit $ac_status) && test -s "$ac_outfile"; then
1421114214
# The compiler can only warn and ignore the option if not recognized
1421214215
# So say no if there are warnings other than the usual output.
@@ -14470,11 +14473,11 @@ else
1447014473
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1447114474
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1447214475
-e 's:$: $lt_compiler_flag:'`
14473-
(eval echo "\"\$as_me:14473: $lt_compile\"" >&5)
14476+
(eval echo "\"\$as_me:14476: $lt_compile\"" >&5)
1447414477
(eval "$lt_compile" 2>conftest.err)
1447514478
ac_status=$?
1447614479
cat conftest.err >&5
14477-
echo "$as_me:14477: \$? = $ac_status" >&5
14480+
echo "$as_me:14480: \$? = $ac_status" >&5
1447814481
if (exit $ac_status) && test -s "$ac_outfile"; then
1447914482
# The compiler can only warn and ignore the option if not recognized
1448014483
# So say no if there are warnings other than the usual output.
@@ -14574,11 +14577,11 @@ else
1457414577
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1457514578
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1457614579
-e 's:$: $lt_compiler_flag:'`
14577-
(eval echo "\"\$as_me:14577: $lt_compile\"" >&5)
14580+
(eval echo "\"\$as_me:14580: $lt_compile\"" >&5)
1457814581
(eval "$lt_compile" 2>out/conftest.err)
1457914582
ac_status=$?
1458014583
cat out/conftest.err >&5
14581-
echo "$as_me:14581: \$? = $ac_status" >&5
14584+
echo "$as_me:14584: \$? = $ac_status" >&5
1458214585
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1458314586
then
1458414587
# The compiler can only warn and ignore the option if not recognized
@@ -17026,7 +17029,7 @@ else
1702617029
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1702717030
lt_status=$lt_dlunknown
1702817031
cat > conftest.$ac_ext <<EOF
17029-
#line 17029 "configure"
17032+
#line 17032 "configure"
1703017033
#include "confdefs.h"
1703117034

1703217035
#if HAVE_DLFCN_H
@@ -17126,7 +17129,7 @@ else
1712617129
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1712717130
lt_status=$lt_dlunknown
1712817131
cat > conftest.$ac_ext <<EOF
17129-
#line 17129 "configure"
17132+
#line 17132 "configure"
1713017133
#include "confdefs.h"
1713117134

1713217135
#if HAVE_DLFCN_H
@@ -19494,11 +19497,11 @@ else
1949419497
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1949519498
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1949619499
-e 's:$: $lt_compiler_flag:'`
19497-
(eval echo "\"\$as_me:19497: $lt_compile\"" >&5)
19500+
(eval echo "\"\$as_me:19500: $lt_compile\"" >&5)
1949819501
(eval "$lt_compile" 2>conftest.err)
1949919502
ac_status=$?
1950019503
cat conftest.err >&5
19501-
echo "$as_me:19501: \$? = $ac_status" >&5
19504+
echo "$as_me:19504: \$? = $ac_status" >&5
1950219505
if (exit $ac_status) && test -s "$ac_outfile"; then
1950319506
# The compiler can only warn and ignore the option if not recognized
1950419507
# So say no if there are warnings other than the usual output.
@@ -19598,11 +19601,11 @@ else
1959819601
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
1959919602
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1960019603
-e 's:$: $lt_compiler_flag:'`
19601-
(eval echo "\"\$as_me:19601: $lt_compile\"" >&5)
19604+
(eval echo "\"\$as_me:19604: $lt_compile\"" >&5)
1960219605
(eval "$lt_compile" 2>out/conftest.err)
1960319606
ac_status=$?
1960419607
cat out/conftest.err >&5
19605-
echo "$as_me:19605: \$? = $ac_status" >&5
19608+
echo "$as_me:19608: \$? = $ac_status" >&5
1960619609
if (exit $ac_status) && test -s out/conftest2.$ac_objext
1960719610
then
1960819611
# The compiler can only warn and ignore the option if not recognized
@@ -21168,11 +21171,11 @@ else
2116821171
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2116921172
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2117021173
-e 's:$: $lt_compiler_flag:'`
21171-
(eval echo "\"\$as_me:21171: $lt_compile\"" >&5)
21174+
(eval echo "\"\$as_me:21174: $lt_compile\"" >&5)
2117221175
(eval "$lt_compile" 2>conftest.err)
2117321176
ac_status=$?
2117421177
cat conftest.err >&5
21175-
echo "$as_me:21175: \$? = $ac_status" >&5
21178+
echo "$as_me:21178: \$? = $ac_status" >&5
2117621179
if (exit $ac_status) && test -s "$ac_outfile"; then
2117721180
# The compiler can only warn and ignore the option if not recognized
2117821181
# So say no if there are warnings other than the usual output.
@@ -21272,11 +21275,11 @@ else
2127221275
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2127321276
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2127421277
-e 's:$: $lt_compiler_flag:'`
21275-
(eval echo "\"\$as_me:21275: $lt_compile\"" >&5)
21278+
(eval echo "\"\$as_me:21278: $lt_compile\"" >&5)
2127621279
(eval "$lt_compile" 2>out/conftest.err)
2127721280
ac_status=$?
2127821281
cat out/conftest.err >&5
21279-
echo "$as_me:21279: \$? = $ac_status" >&5
21282+
echo "$as_me:21282: \$? = $ac_status" >&5
2128021283
if (exit $ac_status) && test -s out/conftest2.$ac_objext
2128121284
then
2128221285
# The compiler can only warn and ignore the option if not recognized
@@ -23507,11 +23510,11 @@ else
2350723510
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2350823511
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2350923512
-e 's:$: $lt_compiler_flag:'`
23510-
(eval echo "\"\$as_me:23510: $lt_compile\"" >&5)
23513+
(eval echo "\"\$as_me:23513: $lt_compile\"" >&5)
2351123514
(eval "$lt_compile" 2>conftest.err)
2351223515
ac_status=$?
2351323516
cat conftest.err >&5
23514-
echo "$as_me:23514: \$? = $ac_status" >&5
23517+
echo "$as_me:23517: \$? = $ac_status" >&5
2351523518
if (exit $ac_status) && test -s "$ac_outfile"; then
2351623519
# The compiler can only warn and ignore the option if not recognized
2351723520
# So say no if there are warnings other than the usual output.
@@ -23775,11 +23778,11 @@ else
2377523778
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2377623779
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2377723780
-e 's:$: $lt_compiler_flag:'`
23778-
(eval echo "\"\$as_me:23778: $lt_compile\"" >&5)
23781+
(eval echo "\"\$as_me:23781: $lt_compile\"" >&5)
2377923782
(eval "$lt_compile" 2>conftest.err)
2378023783
ac_status=$?
2378123784
cat conftest.err >&5
23782-
echo "$as_me:23782: \$? = $ac_status" >&5
23785+
echo "$as_me:23785: \$? = $ac_status" >&5
2378323786
if (exit $ac_status) && test -s "$ac_outfile"; then
2378423787
# The compiler can only warn and ignore the option if not recognized
2378523788
# So say no if there are warnings other than the usual output.
@@ -23879,11 +23882,11 @@ else
2387923882
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
2388023883
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2388123884
-e 's:$: $lt_compiler_flag:'`
23882-
(eval echo "\"\$as_me:23882: $lt_compile\"" >&5)
23885+
(eval echo "\"\$as_me:23885: $lt_compile\"" >&5)
2388323886
(eval "$lt_compile" 2>out/conftest.err)
2388423887
ac_status=$?
2388523888
cat out/conftest.err >&5
23886-
echo "$as_me:23886: \$? = $ac_status" >&5
23889+
echo "$as_me:23889: \$? = $ac_status" >&5
2388723890
if (exit $ac_status) && test -s out/conftest2.$ac_objext
2388823891
then
2388923892
# The compiler can only warn and ignore the option if not recognized

0 commit comments

Comments
 (0)