Skip to content

Commit d259f4b

Browse files
committed
Merge branch 'release/v0.5.1'
2 parents a9acc02 + cbb4334 commit d259f4b

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ As listed in [ICU’s user guide](http://userguide.icu-project.org/conversion/de
7878

7979
## Release history
8080

81+
- v0.5.1 (2017-09-09): Fix compilation errors under Node.js v6 on macOS
8182
- v0.5.0 (2017-07-23):
8283
- Update to ICU 59.1
8384
- Add support for Alpine Linux

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "detect-character-encoding",
3-
"version": "0.5.0",
3+
"version": "0.5.1",
44
"author": "Jakob Krigovsky <[email protected]>",
55
"description": "Detect character encoding using ICU.",
66
"repository": {

vendor/icu/icu.gyp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@
6565
'cflags_cc': [ '-frtti' ],
6666
}],
6767
[ 'OS == "mac" or OS == "ios"', {
68-
'xcode_settings': {'GCC_ENABLE_CPP_RTTI': 'YES' },
68+
'xcode_settings': {
69+
'GCC_ENABLE_CPP_RTTI': 'YES',
70+
'OTHER_CPLUSPLUSFLAGS': [ '-stdlib=libc++' ]
71+
},
6972
}],
7073
[ 'OS == "win"', {
7174
'msvs_settings': {

0 commit comments

Comments
 (0)