1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: allow running configure from any directory

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/17321
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Gibson Fahnestock 2017-11-26 13:30:08 +00:00
parent d2626ef6b7
commit b7ff3c0e04
No known key found for this signature in database
GPG Key ID: B01FBB92821C587A
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -35,21 +35,23 @@ import subprocess
import shutil import shutil
import string import string
# If not run from node/, cd to node/.
os.chdir(os.path.dirname(__file__) or '.')
# gcc and g++ as defaults matches what GYP's Makefile generator does, # gcc and g++ as defaults matches what GYP's Makefile generator does,
# except on OS X. # except on OS X.
CC = os.environ.get('CC', 'cc' if sys.platform == 'darwin' else 'gcc') CC = os.environ.get('CC', 'cc' if sys.platform == 'darwin' else 'gcc')
CXX = os.environ.get('CXX', 'c++' if sys.platform == 'darwin' else 'g++') CXX = os.environ.get('CXX', 'c++' if sys.platform == 'darwin' else 'g++')
root_dir = os.path.dirname(__file__) sys.path.insert(0, os.path.join('tools', 'gyp', 'pylib'))
sys.path.insert(0, os.path.join(root_dir, 'tools', 'gyp', 'pylib'))
from gyp.common import GetFlavor from gyp.common import GetFlavor
# imports in tools/configure.d # imports in tools/configure.d
sys.path.insert(0, os.path.join(root_dir, 'tools', 'configure.d')) sys.path.insert(0, os.path.join('tools', 'configure.d'))
import nodedownload import nodedownload
# imports in tools/ # imports in tools/
sys.path.insert(0, os.path.join(root_dir, 'tools')) sys.path.insert(0, 'tools')
import getmoduleversion import getmoduleversion
from gyp_node import run_gyp from gyp_node import run_gyp
@ -432,7 +434,7 @@ intl_optgroup.add_option('--download',
intl_optgroup.add_option('--download-path', intl_optgroup.add_option('--download-path',
action='store', action='store',
dest='download_path', dest='download_path',
default=os.path.join(root_dir, 'deps'), default='deps',
help='Download directory [default: %default]') help='Download directory [default: %default]')
parser.add_option_group(intl_optgroup) parser.add_option_group(intl_optgroup)
@ -1050,7 +1052,7 @@ def configure_openssl(o):
o['defines'] += ['NODE_WITHOUT_NODE_OPTIONS'] o['defines'] += ['NODE_WITHOUT_NODE_OPTIONS']
if options.openssl_fips: if options.openssl_fips:
o['variables']['openssl_fips'] = options.openssl_fips o['variables']['openssl_fips'] = options.openssl_fips
fips_dir = os.path.join(root_dir, 'deps', 'openssl', 'fips') fips_dir = os.path.join('deps', 'openssl', 'fips')
fips_ld = os.path.abspath(os.path.join(fips_dir, 'fipsld')) fips_ld = os.path.abspath(os.path.join(fips_dir, 'fipsld'))
# LINK is for Makefiles, LD/LDXX is for ninja # LINK is for Makefiles, LD/LDXX is for ninja
o['make_fips_settings'] = [ o['make_fips_settings'] = [
@ -1095,7 +1097,7 @@ def configure_static(o):
def write(filename, data): def write(filename, data):
filename = os.path.join(root_dir, filename) filename = filename
print('creating %s' % filename) print('creating %s' % filename)
f = open(filename, 'w+') f = open(filename, 'w+')
f.write(data) f.write(data)
@ -1217,7 +1219,7 @@ def configure_intl(o):
return return
# this is just the 'deps' dir. Used for unpacking. # this is just the 'deps' dir. Used for unpacking.
icu_parent_path = os.path.join(root_dir, 'deps') icu_parent_path = 'deps'
# The full path to the ICU source directory. Should not include './'. # The full path to the ICU source directory. Should not include './'.
icu_full_path = 'deps/icu' icu_full_path = 'deps/icu'