Skip to content

Commit

Permalink
build: fix error message in configure
Browse files Browse the repository at this point in the history
Replace Node.js to io.js in error messages
  • Loading branch information
Shigeki Ohtsu committed Apr 13, 2015
1 parent b59420c commit b27a99a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions configure
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/doc/UPGRADING.md
Expand Up @@ -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.
Expand All @@ -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 |
Expand Down

0 comments on commit b27a99a

Please sign in to comment.