Skip to content

Commit

Permalink
Restore nasm_exists clauses
Browse files Browse the repository at this point in the history
… for darwin-tvos/simulator builds.

Issue: 326748668
Reviewed-on: #3214
  • Loading branch information
dahlstrom-g committed May 11, 2024
2 parents db41af7 + 51edaca commit 8badd6b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions third_party/libjpeg_turbo/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ source_set("libjpeg_headers") {
}
}

if (current_cpu == "x86" || current_cpu == "x64") {
if (nasm_exists && (current_cpu == "x86" || current_cpu == "x64")) {
if (is_starboard) {
import("//starboard/build/nasm_assemble.gni")
} else {
Expand Down Expand Up @@ -161,10 +161,10 @@ static_library("simd") {
defines = []
}

if (current_cpu == "x86") {
if (current_cpu == "x86" && nasm_exists) {
deps += [ ":simd_asm" ]
sources = [ "simd/i386/jsimd.c" ]
} else if (current_cpu == "x64") {
} else if (current_cpu == "x64" && nasm_exists) {
deps += [ ":simd_asm" ]
sources = [ "simd/x86_64/jsimd.c" ]
} else if ((current_cpu == "arm" || current_cpu == "arm64") && arm_use_neon) {
Expand Down

0 comments on commit 8badd6b

Please sign in to comment.