summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorByoungchan Lee <daniel.l@hpcnt.com>2021-09-17 20:17:59 +0900
committerByoungchan Lee <daniel.l@hpcnt.com>2021-09-17 20:17:59 +0900
commit335fe83e133e1a113e87994e000b062047c662fc (patch)
treed4e185bdef0ccf522705f25d61a3e5285e1dd696
parent4e6fe9d1549e4ffb6c804494573e404849dfe7de (diff)
downloadnasm-335fe83e133e1a113e87994e000b062047c662fc.tar.gz
Fix issue where nasm could emit incorrect minimum OS on MacOS
The gn variable mac_min_system_version can be greater than mac_deployment_target, so mac_deployment_target should be used to determine the minimum OS version of MacOS. Bug: None Change-Id: I80a62ac211d1d9be5473bc3c37f1146182e341a8
-rw-r--r--nasm_assemble.gni2
1 files changed, 1 insertions, 1 deletions
diff --git a/nasm_assemble.gni b/nasm_assemble.gni
index 2b380dbf..4c3d5345 100644
--- a/nasm_assemble.gni
+++ b/nasm_assemble.gni
@@ -55,7 +55,7 @@ if ((is_mac || is_ios) && (current_cpu == "x86" || current_cpu == "x64")) {
_nasm_flags = [ "-fmacho64" ]
}
if (is_mac) {
- _nasm_flags += [ "--macho-min-os=macos$mac_min_system_version" ]
+ _nasm_flags += [ "--macho-min-os=macos$mac_deployment_target" ]
} else if (is_ios) {
if (target_environment == "device") {
_nasm_flags += [ "--macho-min-os=ios$ios_deployment_target" ]