From b27a99ace7b03662c1cc8aa4fe6d76b0c437bbea Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Sat, 11 Apr 2015 19:22:15 +0900 Subject: [PATCH] build: fix error message in configure Replace Node.js to io.js in error messages --- configure | 6 +++--- deps/openssl/doc/UPGRADING.md | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 06f0e9a531b558..ace367149cfb27 100755 --- a/configure +++ b/configure @@ -360,7 +360,7 @@ def get_llvm_version(cc): proc = subprocess.Popen(shlex.split(cc) + ['-v'], stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE) except OSError: - print '''Node.js configure error: No acceptable C compiler found! + print '''io.js configure error: No acceptable C compiler found! Please make sure you have a C compiler installed on your system and/or consider adjusting the CC environment variable if you installed @@ -385,7 +385,7 @@ def get_gas_version(cc): stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE) except OSError: - print '''Node.js configure error: No acceptable C compiler found! + print '''io.js configure error: No acceptable C compiler found! Please make sure you have a C compiler installed on your system and/or consider adjusting the CC environment variable if you installed @@ -443,7 +443,7 @@ def cc_macros(): stdout=subprocess.PIPE, stderr=subprocess.PIPE) except OSError: - print '''Node.js configure error: No acceptable C compiler found! + print '''io.js configure error: No acceptable C compiler found! Please make sure you have a C compiler installed on your system and/or consider adjusting the CC environment variable if you installed diff --git a/deps/openssl/doc/UPGRADING.md b/deps/openssl/doc/UPGRADING.md index 74b544df07315b..b261afbf94329d 100644 --- a/deps/openssl/doc/UPGRADING.md +++ b/deps/openssl/doc/UPGRADING.md @@ -8,7 +8,8 @@ to 1.0.2a in io.js. The openssl build system is based on the `Configure` perl script in `deps/openssl/openssl`. For example, running `Configure linux_x86-64` in the openssl repository generates `Makefile` and `opensslconf.h` for -the target architectures of linux_x86_64. +the linux_x86_64 target architecture. + The `Makefile` contains the list of asm files which are generated by perl scripts during build so that we can get the most of use of the hardware performance according to the type of cpus. @@ -35,7 +36,7 @@ The tested platform in CI are also listed. | linux | x64 | o | o |linux-x86_64 | o | | linux | arm | o | o |linux-arm | o | | linux | arm64 | o | o |linux-aarch64 | o | -| mac | ia32 | o | o |darwin-i386-cc | o | +| mac | ia32 | o | o |darwin-i386-cc | - | | mac | x64 | o | o |darwin64-x86_64-cc | o | | win | ia32 | o | o(*3)|VC-WIN32 | x | | win | x64 | o | o |VC-WIN64A | o |