@@ -120,52 +120,44 @@ def add_target_env(env, build_platform, target_triple, build_env):
120
120
raise Exception ("unhandled macOS machine value: %s" % machine )
121
121
122
122
if target_triple == "aarch64-apple-darwin" :
123
- env ["TARGET_TRIPLE" ] = "aarch64-apple-darwin"
124
123
sdk_platform = "macosx"
125
124
min_version_flags = [
126
125
"-mmacosx-version-min=%s" % MACOSX_DEPLOYMENT_TARGET_ARM
127
126
]
128
127
env ["APPLE_MIN_DEPLOYMENT_TARGET" ] = MACOSX_DEPLOYMENT_TARGET_ARM
129
128
elif target_triple == "aarch64-apple-ios" :
130
- env ["TARGET_TRIPLE" ] = "aarch64-apple-ios"
131
129
# TODO arm64e not supported by open source Clang.
132
130
# TODO add arm7 / arm7s?
133
131
sdk_platform = "iphoneos"
134
132
min_version_flags = ["-mios-version-min=%s" % IPHONEOS_DEPLOYMENT_TARGET ]
135
133
env ["APPLE_MIN_DEPLOYMENT_TARGET" ] = IPHONEOS_DEPLOYMENT_TARGET
136
134
elif target_triple == "arm64-apple-tvos" :
137
- env ["TARGET_TRIPLE" ] = "arm64-apple-tvos"
138
135
sdk_platform = "appletvos"
139
136
min_version_flags = ["-mappletvos-version-min=%s" % TVOS_DEPLOYMENT_TARGET ]
140
137
env ["APPLE_MIN_DEPLOYMENT_TARGET" ] = TVOS_DEPLOYMENT_TARGET
141
138
elif target_triple == "thumbv7k-apple-watchos" :
142
- env ["TARGET_TRIPLE" ] = "thumbv7k-apple-watchos"
143
139
sdk_platform = "watchos"
144
140
min_version_flags = ["-mwatchos-version-min=%s" % WATCHOS_DEPLOYMENT_TARGET ]
145
141
env ["APPLE_MIN_DEPLOYMENT_TARGET" ] = WATCHOS_DEPLOYMENT_TARGET
146
142
elif target_triple == "x86_64-apple-darwin" :
147
- env ["TARGET_TRIPLE" ] = "x86_64-apple-darwin"
148
143
sdk_platform = "macosx"
149
144
min_version_flags = [
150
145
"-mmacosx-version-min=%s" % MACOSX_DEPLOYMENT_TARGET_X86
151
146
]
152
147
env ["APPLE_MIN_DEPLOYMENT_TARGET" ] = MACOSX_DEPLOYMENT_TARGET_X86
153
148
elif target_triple == "x86_64-apple-ios" :
154
- env ["TARGET_TRIPLE" ] = "x86_64-apple-ios"
155
149
sdk_platform = "iphonesimulator"
156
150
min_version_flags = [
157
151
"-mios-simulator-version-min=%s" % IPHONEOS_DEPLOYMENT_TARGET ,
158
152
]
159
153
env ["APPLE_MIN_DEPLOYMENT_TARGET" ] = IPHONEOS_DEPLOYMENT_TARGET
160
154
elif target_triple == "x86_64-apple-tvos" :
161
- env ["TARGET_TRIPLE" ] = "x86_64-apple-tvos"
162
155
sdk_platform = "appletvsimulator"
163
156
min_version_flags = [
164
157
"-mappletvsimulator-version-min=%s" % TVOS_DEPLOYMENT_TARGET
165
158
]
166
159
env ["APPLE_MIN_DEPLOYMENT_TARGET" ] = TVOS_DEPLOYMENT_TARGET
167
160
elif target_triple == "x86_64-apple-watchos" :
168
- env ["TARGET_TRIPLE" ] = "x86_64-apple-watchos"
169
161
sdk_platform = "watchsimulator"
170
162
min_version_flags = [
171
163
"-mwatchsimulator-version-min=%s" % WATCHOS_DEPLOYMENT_TARGET
@@ -174,6 +166,7 @@ def add_target_env(env, build_platform, target_triple, build_env):
174
166
else :
175
167
raise ValueError ("unhandled target triple: %s" % target_triple )
176
168
169
+ env ["TARGET_TRIPLE" ] = target_triple
177
170
env ["PATH" ] = "/usr/bin:/bin"
178
171
179
172
extra_target_cflags .extend (
0 commit comments