[[ Bug 19901 ]] Merge gyp conditions block for odbc-server target.

livecodemichael · livecodemichael · commit 53ef1848c66a · 2017-08-24T14:16:09.000+01:00
diff --git a/revdb/revdb.gyp b/revdb/revdb.gyp
@@ -298,6 +298,15 @@
 							'-lodbc32.lib',
 						],
 					},
+					'OS == "linux"',
+					{
+						'libraries':
+						[
+							'-Wl,-Bstatic',
+							'-lstdc++',
+							'-Wl,-Bdynamic',
+						],
+					},
 				],
 			],
 			
@@ -331,20 +340,6 @@
 					'_releasedbconnectionref',
 				],
 			},
-			'conditions':
-			[
-				[
-					'OS == "linux"',
-					{
-						'libraries':
-						[
-							'-Wl,-Bstatic',
-							'-lstdc++',
-							'-Wl,-Bdynamic',
-						],
-					},
-				],
-			],
 			
 			'all_dependent_settings':
 			{
@@ -453,7 +448,7 @@
 					},
 				],
 			],
-			
+
 			'all_dependent_settings':
 			{
 				'variables':
