summaryrefslogtreecommitdiff
path: root/recipes/libvpx.recipe
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-06-12 19:52:12 +0530
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>2020-06-12 15:30:01 +0000
commit0d52d188634938f11ac3f9c943061372627a2ce1 (patch)
tree935b85d1f4bd0c709d967a46802780475e4c2d5d /recipes/libvpx.recipe
parent5443891fa25490fe9a32e4b099e685ac90c4ebc0 (diff)
libvpx.recipe: Fix nasm not being found sometimes on MSVC
For some reason, nasm doesn't get found by MSBuild.exe anymore even though it's in PATH when it's called. Just pass the full path to it. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/509>
Diffstat (limited to 'recipes/libvpx.recipe')
-rw-r--r--recipes/libvpx.recipe3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe
index 7a60a575..b35058a6 100644
--- a/recipes/libvpx.recipe
+++ b/recipes/libvpx.recipe
@@ -146,8 +146,9 @@ class Recipe(recipe.Recipe):
shutil.copy(o, f)
elif self.using_msvc():
# Visual Studio solution hard-codes yasm
+ nasm = os.path.join(self.config.build_tools_prefix, 'bin', 'nasm.exe')
shell.replace(os.path.join(self.build_dir, 'build/make/gen_msvs_vcxproj.sh'),
- {'yasm ': 'nasm ', '-Xvc -g cv8': '-Xvc -g -F cv8'})
+ {'yasm': nasm, '-Xvc -g cv8': '-Xvc -g -F cv8'})
await super().configure()
async def install(self):