Skip to content

Commit 0318a23

Browse files
mabdinurgnufede
andauthored
fix(asm): ensure platform can compile taint tracking sources [backport #5289 to 1.9] (#5312)
backport: #5289 ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/contributing.html#Release-Note-Guidelines) are followed. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Author is aware of the performance implications of this PR as reported in the benchmarks PR comment. ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer is aware of, and discussed the performance implications of this PR as reported in the benchmarks PR comment. Co-authored-by: Federico Mon <[email protected]>
1 parent c168e9c commit 0318a23

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
fixes:
3+
- |
4+
ASM: Resolves installation issues with compiling native code on Windows and unknown platforms.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def get_exts_for(name):
280280
extra_compile_args=debug_compile_args,
281281
),
282282
]
283-
if platform.system() != "Windows":
283+
if platform.system() not in ("Windows", ""):
284284
ext_modules.append(
285285
Extension(
286286
"ddtrace.appsec.iast._stacktrace",
@@ -298,7 +298,7 @@ def get_exts_for(name):
298298
# Sort source files for reproducibility
299299
sources=sorted(
300300
glob.glob(
301-
os.path.join(HERE, "ddtrace", "appsec", "iast", "_taint_tracking", "**", "*.cpp"),
301+
os.path.join("ddtrace", "appsec", "iast", "_taint_tracking", "**", "*.cpp"),
302302
recursive=True,
303303
)
304304
),

0 commit comments

Comments
 (0)