Skip to content

Commit b27a99a

Browse files
author
Shigeki Ohtsu
committed
build: fix error message in configure
Replace Node.js to io.js in error messages
1 parent b59420c commit b27a99a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

configure

+3-3
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def get_llvm_version(cc):
360360
proc = subprocess.Popen(shlex.split(cc) + ['-v'], stdin=subprocess.PIPE,
361361
stderr=subprocess.PIPE, stdout=subprocess.PIPE)
362362
except OSError:
363-
print '''Node.js configure error: No acceptable C compiler found!
363+
print '''io.js configure error: No acceptable C compiler found!
364364
365365
Please make sure you have a C compiler installed on your system and/or
366366
consider adjusting the CC environment variable if you installed
@@ -385,7 +385,7 @@ def get_gas_version(cc):
385385
stdin=subprocess.PIPE, stderr=subprocess.PIPE,
386386
stdout=subprocess.PIPE)
387387
except OSError:
388-
print '''Node.js configure error: No acceptable C compiler found!
388+
print '''io.js configure error: No acceptable C compiler found!
389389
390390
Please make sure you have a C compiler installed on your system and/or
391391
consider adjusting the CC environment variable if you installed
@@ -443,7 +443,7 @@ def cc_macros():
443443
stdout=subprocess.PIPE,
444444
stderr=subprocess.PIPE)
445445
except OSError:
446-
print '''Node.js configure error: No acceptable C compiler found!
446+
print '''io.js configure error: No acceptable C compiler found!
447447
448448
Please make sure you have a C compiler installed on your system and/or
449449
consider adjusting the CC environment variable if you installed

deps/openssl/doc/UPGRADING.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ to 1.0.2a in io.js.
88
The openssl build system is based on the `Configure` perl script in
99
`deps/openssl/openssl`. For example, running `Configure linux_x86-64`
1010
in the openssl repository generates `Makefile` and `opensslconf.h` for
11-
the target architectures of linux_x86_64.
11+
the linux_x86_64 target architecture.
12+
1213
The `Makefile` contains the list of asm files which are generated by
1314
perl scripts during build so that we can get the most of use of the
1415
hardware performance according to the type of cpus.
@@ -35,7 +36,7 @@ The tested platform in CI are also listed.
3536
| linux | x64 | o | o |linux-x86_64 | o |
3637
| linux | arm | o | o |linux-arm | o |
3738
| linux | arm64 | o | o |linux-aarch64 | o |
38-
| mac | ia32 | o | o |darwin-i386-cc | o |
39+
| mac | ia32 | o | o |darwin-i386-cc | - |
3940
| mac | x64 | o | o |darwin64-x86_64-cc | o |
4041
| win | ia32 | o | o(*3)|VC-WIN32 | x |
4142
| win | x64 | o | o |VC-WIN64A | o |

0 commit comments

Comments
 (0)