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

Fix GYP build on OSX

Browse Source 
Broken due to DOS line endings.

  ./configure-gyp
  make -f Makefile-gyp
This commit is contained in:
Ryan Dahl 2011-08-15 13:40:17 -07:00
parent 54b409d650
commit 25a5e90289
3 changed files with 172 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile-gyp
View File

@ -1,13 +1,13 @@
BUILDTYPE ?= Release BUILDTYPE ?= Release
all: out/Makefile all: out/Makefile
$(MAKE) -f Makefile-nodegyp BUILDTYPE=$(BUILDTYPE) $(MAKE) -C out BUILDTYPE=$(BUILDTYPE)
-ln -fs out/Release/node node -ln -fs out/Release/node node
-ln -fs out/Debug/node node_g -ln -fs out/Debug/node node_g
out/Release/node: all out/Release/node: all
out/Makefile: node.gyp deps/uv/build/all.gyp out/Makefile: node.gyp deps/uv/uv.gyp
tools/gyp_node -f make tools/gyp_node -f make
clean: clean:

328
common.gypi
View File

@ -1,164 +1,164 @@
{ {
'variables': { 'variables': {
'target_arch%': 'ia32', # set v8's target architecture 'target_arch%': 'ia32', # set v8's target architecture
'host_arch%': 'ia32', # set v8's host architecture 'host_arch%': 'ia32', # set v8's host architecture
'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds
'component%': 'static_library', # NB. these names match with what V8 expects 'component%': 'static_library', # NB. these names match with what V8 expects
'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way
}, },
'target_defaults': { 'target_defaults': {
'default_configuration': 'Debug', 'default_configuration': 'Debug',
'configurations': { 'configurations': {
'Debug': { 'Debug': {
'defines': [ 'DEBUG', '_DEBUG' ], 'defines': [ 'DEBUG', '_DEBUG' ],
'cflags': [ '-g', '-O0' ], 'cflags': [ '-g', '-O0' ],
'msvs_settings': { 'msvs_settings': {
'VCCLCompilerTool': { 'VCCLCompilerTool': {
'target_conditions': [ 'target_conditions': [
['library=="static_library"', { ['library=="static_library"', {
'RuntimeLibrary': 1, # static debug 'RuntimeLibrary': 1, # static debug
}, { }, {
'RuntimeLibrary': 3, # DLL debug 'RuntimeLibrary': 3, # DLL debug
}], }],
], ],
'Optimization': 0, # /Od, no optimization 'Optimization': 0, # /Od, no optimization
'MinimalRebuild': 'true', 'MinimalRebuild': 'true',
'OmitFramePointers': 'false', 'OmitFramePointers': 'false',
'BasicRuntimeChecks': 3, # /RTC1 'BasicRuntimeChecks': 3, # /RTC1
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'LinkIncremental': 2, # enable incremental linking 'LinkIncremental': 2, # enable incremental linking
}, },
}, },
}, },
'Release': { 'Release': {
'defines': [ 'NDEBUG' ], 'defines': [ 'NDEBUG' ],
'cflags': [ '-O3', '-fomit-frame-pointer', '-fdata-sections', '-ffunction-sections' ], 'cflags': [ '-O3', '-fomit-frame-pointer', '-fdata-sections', '-ffunction-sections' ],
'msvs_settings': { 'msvs_settings': {
'VCCLCompilerTool': { 'VCCLCompilerTool': {
'target_conditions': [ 'target_conditions': [
['library=="static_library"', { ['library=="static_library"', {
'RuntimeLibrary': 0, # static release 'RuntimeLibrary': 0, # static release
}, { }, {
'RuntimeLibrary': 2, # debug release 'RuntimeLibrary': 2, # debug release
}], }],
], ],
'Optimization': 3, # /Ox, full optimization 'Optimization': 3, # /Ox, full optimization
'FavorSizeOrSpeed': 1, # /Ot, favour speed over size 'FavorSizeOrSpeed': 1, # /Ot, favour speed over size
'InlineFunctionExpansion': 2, # /Ob2, inline anything eligible 'InlineFunctionExpansion': 2, # /Ob2, inline anything eligible
'WholeProgramOptimization': 'true', # /GL, whole program optimization, needed for LTCG 'WholeProgramOptimization': 'true', # /GL, whole program optimization, needed for LTCG
'OmitFramePointers': 'true', 'OmitFramePointers': 'true',
'EnableFunctionLevelLinking': 'true', 'EnableFunctionLevelLinking': 'true',
'EnableIntrinsicFunctions': 'true', 'EnableIntrinsicFunctions': 'true',
'AdditionalOptions': [ 'AdditionalOptions': [
'/MP', # compile across multiple CPUs '/MP', # compile across multiple CPUs
], ],
}, },
'VCLibrarianTool': { 'VCLibrarianTool': {
'AdditionalOptions': [ 'AdditionalOptions': [
'/LTCG', # link time code generation '/LTCG', # link time code generation
], ],
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'LinkTimeCodeGeneration': 1, # link-time code generation 'LinkTimeCodeGeneration': 1, # link-time code generation
'OptimizeReferences': 2, # /OPT:REF 'OptimizeReferences': 2, # /OPT:REF
'EnableCOMDATFolding': 2, # /OPT:ICF 'EnableCOMDATFolding': 2, # /OPT:ICF
'LinkIncremental': 1, # disable incremental linking 'LinkIncremental': 1, # disable incremental linking
}, },
}, },
} }
}, },
'msvs_settings': { 'msvs_settings': {
'VCCLCompilerTool': { 'VCCLCompilerTool': {
'StringPooling': 'true', # pool string literals 'StringPooling': 'true', # pool string literals
'DebugInformationFormat': 3, # Generate a PDB 'DebugInformationFormat': 3, # Generate a PDB
'WarningLevel': 3, 'WarningLevel': 3,
'BufferSecurityCheck': 'true', 'BufferSecurityCheck': 'true',
'ExceptionHandling': 1, # /EHsc 'ExceptionHandling': 1, # /EHsc
'SuppressStartupBanner': 'true', 'SuppressStartupBanner': 'true',
'WarnAsError': 'false', 'WarnAsError': 'false',
}, },
'VCLibrarianTool': { 'VCLibrarianTool': {
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'GenerateDebugInformation': 'true', 'GenerateDebugInformation': 'true',
'RandomizedBaseAddress': 2, # enable ASLR 'RandomizedBaseAddress': 2, # enable ASLR
'DataExecutionPrevention': 2, # enable DEP 'DataExecutionPrevention': 2, # enable DEP
'AllowIsolation': 'true', 'AllowIsolation': 'true',
'SuppressStartupBanner': 'true', 'SuppressStartupBanner': 'true',
}, },
}, },
'conditions': [ 'conditions': [
['OS == "win"', { ['OS == "win"', {
'msvs_cygwin_shell': 0, # prevent actions from trying to use cygwin 'msvs_cygwin_shell': 0, # prevent actions from trying to use cygwin
'defines': [ 'defines': [
'WIN32', 'WIN32',
# we don't really want VC++ warning us about # we don't really want VC++ warning us about
# how dangerous C functions are... # how dangerous C functions are...
'_CRT_SECURE_NO_DEPRECATE', '_CRT_SECURE_NO_DEPRECATE',
# ... or that C implementations shouldn't use # ... or that C implementations shouldn't use
# POSIX names # POSIX names
'_CRT_NONSTDC_NO_DEPRECATE', '_CRT_NONSTDC_NO_DEPRECATE',
], ],
}], }],
[ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
'target_defaults': { 'target_defaults': {
'cflags': [ '-Wall', '-pthread', '-fno-rtti', '-fno-exceptions' ], 'cflags': [ '-Wall', '-pthread', '-fno-rtti', '-fno-exceptions' ],
'ldflags': [ '-pthread', ], 'ldflags': [ '-pthread', ],
'conditions': [ 'conditions': [
[ 'target_arch=="ia32"', { [ 'target_arch=="ia32"', {
'cflags': [ '-m32' ], 'cflags': [ '-m32' ],
'ldflags': [ '-m32' ], 'ldflags': [ '-m32' ],
}], }],
[ 'OS=="linux"', { [ 'OS=="linux"', {
'cflags': [ '-ansi' ], 'cflags': [ '-ansi' ],
}], }],
[ 'visibility=="hidden"', { [ 'visibility=="hidden"', {
'cflags': [ '-fvisibility=hidden' ], 'cflags': [ '-fvisibility=hidden' ],
}], }],
], ],
}, },
}], }],
['OS=="mac"', { ['OS=="mac"', {
'target_defaults': { 'target_defaults': {
'xcode_settings': { 'xcode_settings': {
'ALWAYS_SEARCH_USER_PATHS': 'NO', 'ALWAYS_SEARCH_USER_PATHS': 'NO',
'GCC_C_LANGUAGE_STANDARD': 'ansi', # -ansi 'GCC_C_LANGUAGE_STANDARD': 'ansi', # -ansi
'GCC_CW_ASM_SYNTAX': 'NO', # No -fasm-blocks 'GCC_CW_ASM_SYNTAX': 'NO', # No -fasm-blocks
'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic 'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic
# (Equivalent to -fPIC) # (Equivalent to -fPIC)
'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings
# GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden # GCC_INLINES_ARE_PRIVATE_EXTERN maps to -fvisibility-inlines-hidden
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES', 'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES', # -Werror 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES', # -Werror
'GCC_VERSION': '4.2', 'GCC_VERSION': '4.2',
'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof
'MACOSX_DEPLOYMENT_TARGET': '10.4', # -mmacosx-version-min=10.4 'MACOSX_DEPLOYMENT_TARGET': '10.4', # -mmacosx-version-min=10.4
'PREBINDING': 'NO', # No -Wl,-prebind 'PREBINDING': 'NO', # No -Wl,-prebind
'USE_HEADERMAP': 'NO', 'USE_HEADERMAP': 'NO',
'OTHER_CFLAGS': [ 'OTHER_CFLAGS': [
'-fno-strict-aliasing', '-fno-strict-aliasing',
], ],
'WARNING_CFLAGS': [ 'WARNING_CFLAGS': [
'-Wall', '-Wall',
'-Wendif-labels', '-Wendif-labels',
'-W', '-W',
'-Wno-unused-parameter', '-Wno-unused-parameter',
'-Wnon-virtual-dtor', '-Wnon-virtual-dtor',
], ],
}, },
'target_conditions': [ 'target_conditions': [
['_type!="static_library"', { ['_type!="static_library"', {
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
}], }],
], ],
}, },
}], }],
], ],
}, },
} }

12
deps/v8/tools/gyp/v8-node.gyp vendored
View File

@ -1,6 +1,6 @@
{ {
'includes': [ 'includes': [
'../../build/common.gypi', '../../build/common.gypi',
'v8.gyp' 'v8.gyp'
], ],
} }