File tree 1 file changed +8
-1
lines changed
1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -41,11 +41,18 @@ def configure(self):
41
41
def layout (self ):
42
42
basic_layout (self , src_folder = "src" )
43
43
44
+ @property
45
+ def _is_host_32bit (self ):
46
+ return self .settings .arch in ["armv7" , "x86" ]
47
+
44
48
def validate (self ):
45
49
if self .settings .os == "Macos" and self .settings .arch == "armv8" and cross_building (self ):
46
50
raise ConanInvalidConfiguration (f"{ self .ref } can not be cross-built to Mac M1. Please, try any version >=2.1" )
47
51
elif Version (self .version ) <= "2.1.0-beta1" and self .settings .os == "Macos" and self .settings .arch == "armv8" :
48
52
raise ConanInvalidConfiguration (f"{ self .ref } is not supported by Mac M1. Please, try any version >=2.1" )
53
+ elif self ._is_host_32bit and self .settings_build .os == "Macos" :
54
+ # well, technically it should work on macOS <= 10.14
55
+ raise ConanInvalidConfiguration (f"{ self .ref } cannot be cross-built to a 32-bit platform on macOS, see https://github.com/LuaJIT/LuaJIT/issues/664" )
49
56
50
57
def source (self ):
51
58
filename = f"LuaJIT-{ self .version } .tar.gz"
@@ -105,7 +112,7 @@ def _make_arguments(self):
105
112
target_flag = f"{ to_apple_arch (self )} -apple-ios{ self ._apple_deployment_target (default = '' )} "
106
113
args .extend ([
107
114
f"CROSS={ os .path .dirname (xcrun .cxx )} /" ,
108
- f"TARGET_FLAGS='-isysroot \ "{ xcrun .sdk_path } \ " -target { target_flag } '" ,
115
+ f""" TARGET_FLAGS='-isysroot "{ xcrun .sdk_path } " -target { target_flag } '"" " ,
109
116
"TARGET_SYS=iOS" ,
110
117
])
111
118
return args
You can’t perform that action at this time.
0 commit comments