Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
'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
'python%': 'python',

'gas_version%': 0,
'llvm_version%': 0,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a variable set in the configure script when clang is detected.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused. The configure script wasn't modified in this PR. How come these two lines weren't necessary before?

Copy link
Contributor Author

@refack refack Oct 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to check llvm_version version (without first doing "feature detection"), we need these vars with default value (90f055f).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P.S. It not necessary in the current changeset, so I could move this to a new PR


'node_shared%': 'false',
'force_dynamic_crt%': 0,
'node_use_v8_platform%': 'true',
Expand Down Expand Up @@ -198,6 +200,7 @@
# simply not feasible to squelch all warnings, never mind that the
# libraries in deps/ are not under our control.
'cflags!': ['-Werror'],
'cflags_cc': [ '-std=gnu++11' ],
'msvs_settings': {
'VCCLCompilerTool': {
'StringPooling': 'true', # pool string literals
Expand All @@ -211,6 +214,9 @@
# and their sheer number drowns out other, more legitimate warnings.
'DisableSpecificWarnings': ['4267'],
'WarnAsError': 'false',
'AdditionalOptions': [
'/std:c++14'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary, both VS2015 and VS2015 default to /std:c++14.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather have this (1) for being explicit (2) for future proofing, in case the default changes to C++17 or higher

],
},
'VCLibrarianTool': {
},
Expand Down Expand Up @@ -293,7 +299,7 @@
}],
[ 'OS in "linux freebsd openbsd solaris android aix"', {
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++0x' ],
'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ],
'ldflags': [ '-rdynamic' ],
'target_conditions': [
# The 1990s toolchain on SmartOS can't handle thin archives.
Expand Down Expand Up @@ -409,7 +415,7 @@
['clang==1', {
'xcode_settings': {
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', # -std=gnu++0x
'CLANG_CXX_LANGUAGE_STANDARD': 'c++14', # -std=c++14
'CLANG_CXX_LIBRARY': 'libc++',
},
}],
Expand All @@ -431,7 +437,7 @@
'ldflags': [
'-Wl,--export-dynamic',
],
}]
}],
],
}
}