From 88d4e779b92aa5a9c4ad5384fe73dee152d10127 Mon Sep 17 00:00:00 2001
From: Yuchen Zeng <zyc@google.com>
Date: Tue, 16 Aug 2016 22:34:02 -0700
Subject: [PATCH] Fix python build on windows
---
package.json | 2 +-
setup.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 4b175fe4c5..c74dbe45e3 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"test": "./node_modules/.bin/mocha src/node/test && npm run-script lint",
"gen_docs": "./node_modules/.bin/jsdoc -c src/node/jsdoc_conf.json",
"coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha src/node/test",
- "install": "./node_modules/.bin/node-pre-gyp install --fallback-to-build --library='static_library'"
+ "install": "./node_modules/.bin/node-pre-gyp install --fallback-to-build --library=static_library"
},
"bundledDependencies": ["node-pre-gyp"],
"dependencies": {
diff --git a/setup.py b/setup.py
index a408d24ff9..1ef03cff15 100644
--- a/setup.py
+++ b/setup.py
@@ -148,11 +148,13 @@ if "win32" in sys.platform:
DEFINE_MACROS = (
('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
- ('GPR_BACKWARDS_COMPATIBILITY_MODE', 1), ('HAVE_CONFIG_H', 1),)
+ ('GPR_BACKWARDS_COMPATIBILITY_MODE', 1),)
if "win32" in sys.platform:
DEFINE_MACROS += (('OPENSSL_WINDOWS', 1), ('WIN32_LEAN_AND_MEAN', 1),)
if '64bit' in platform.architecture()[0]:
DEFINE_MACROS += (('MS_WIN64', 1),)
+else:
+ DEFINE_MACROS += (('HAVE_CONFIG_H', 1),)
LDFLAGS = tuple(EXTRA_LINK_ARGS)
CFLAGS = tuple(EXTRA_COMPILE_ARGS)
--
GitLab