mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 05:49:01 +08:00
ba1c3aa63e
* [libvpx] switch from yasm to nasm
* [vcpkg] install nasm on azure for osx
* Revert "[vcpkg] install nasm on azure for osx"
This reverts commit f65ad1bdad.
* [VMSS] Install nasm on OSX
* [libvpx] bump port version
* [libvpx] Add --as=nasm for non-MSVC triplets
* [libvpx] Fix nasm debug format flag
* Back out nasm change applied in https://github.com/microsoft/vcpkg/pull/15258
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Long Nguyen <nguyen.long.908132@gmail.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
22 lines
803 B
Diff
22 lines
803 B
Diff
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
|
index 206b54f..49cd13e 100644
|
|
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -1361,12 +1361,14 @@ EOF
|
|
case ${tgt_os} in
|
|
win32)
|
|
add_asflags -f win32
|
|
- enabled debug && add_asflags -g cv8
|
|
+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
|
|
+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
|
|
EXE_SFX=.exe
|
|
;;
|
|
win64)
|
|
add_asflags -f win64
|
|
- enabled debug && add_asflags -g cv8
|
|
+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
|
|
+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
|
|
EXE_SFX=.exe
|
|
;;
|
|
linux*|solaris*|android*)
|