Merge pull request #1344 from rsmarples/fix-clang

implausible · web-flow · commit 4611ca75f925 · 2017-11-28T10:17:10.000-08:00
Fix compiling with clang
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
@@ -98,16 +98,9 @@
           }
         ],
         [
-          "OS=='linux' and '<!(echo \"$CXX\")'=='clang++'", {
+          "OS=='linux' or OS.endswith('bsd')", {
             "cflags": [
-              "-Wno-c++11-extensions"
-            ]
-          }
-        ],
-        [
-          "OS=='linux' and '<!(echo \"$CXX\")'!='clang++'", {
-            "cflags": [
-              "-std=c++0x"
+              "-std=c++11"
             ]
           }
         ]
diff --git a/vendor/openssl/openssl.gyp b/vendor/openssl/openssl.gyp
@@ -152,7 +152,7 @@
           }],
         ]
       }],
-      ['is_clang==1 or gcc_version>=43', {
+      ['gcc_version>=43', {
         'cflags': ['-Wno-old-style-declaration'],
       }],
       ['OS=="solaris"', {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@`
`152`	`152`	`}],`
`153`	`153`	`]`
`154`	`154`	`}],`
`155`		`- ['is_clang==1 or gcc_version>=43', {`
	`155`	`+ ['gcc_version>=43', {`
`156`	`156`	`'cflags': ['-Wno-old-style-declaration'],`
`157`	`157`	`}],`
`158`	`158`	`['OS=="solaris"', {`