tjh.dev
1diff --git a/Makefile b/Makefile
2index 5769d2a1..f505dd81 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -71,7 +71,7 @@ vendor/llhttp/node_modules: vendor/llhttp/package.json
6 generate-llhttp: .llhttp-gen
7
8 .PHONY: cythonize
9-cythonize: .install-cython $(PYXS:.pyx=.c)
10+cythonize: $(PYXS:.pyx=.c)
11
12 .install-deps: .install-cython $(PYXS:.pyx=.c) $(call to-hash,$(CYS) $(REQS))
13 @python -m pip install -r requirements/dev.txt -c requirements/constraints.txt
14diff --git a/aiohttp/_cparser.pxd b/aiohttp/_cparser.pxd
15index 165dd61d..bc6bf86d 100644
16--- a/aiohttp/_cparser.pxd
17+++ b/aiohttp/_cparser.pxd
18@@ -10,7 +10,7 @@ from libc.stdint cimport (
19 )
20
21
22-cdef extern from "../vendor/llhttp/build/llhttp.h":
23+cdef extern from "@llhttpDev@/include/llhttp.h":
24
25 struct llhttp__internal_s:
26 int32_t _index
27diff --git a/setup.py b/setup.py
28index 4d59a022..d87d5b69 100644
29--- a/setup.py
30+++ b/setup.py
31@@ -17,13 +17,6 @@ if sys.implementation.name != "cpython":
32 NO_EXTENSIONS = True
33
34
35-if IS_GIT_REPO and not (HERE / "vendor/llhttp/README.md").exists():
36- print("Install submodules when building from git clone", file=sys.stderr)
37- print("Hint:", file=sys.stderr)
38- print(" git submodule update --init", file=sys.stderr)
39- sys.exit(2)
40-
41-
42 # NOTE: makefile cythonizes all Cython modules
43
44 extensions = [
45@@ -33,12 +26,11 @@ extensions = [
46 [
47 "aiohttp/_http_parser.c",
48 "aiohttp/_find_header.c",
49- "vendor/llhttp/build/c/llhttp.c",
50- "vendor/llhttp/src/native/api.c",
51- "vendor/llhttp/src/native/http.c",
52 ],
53 define_macros=[("LLHTTP_STRICT_MODE", 0)],
54- include_dirs=["vendor/llhttp/build"],
55+ include_dirs=["@llhttpDev@/include"],
56+ library_dirs=["@llhttpLib@/lib"],
57+ libraries=["llhttp"],
58 ),
59 Extension("aiohttp._helpers", ["aiohttp/_helpers.c"]),
60 Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]),