Fix compilation with system CXX
@@ -1169,6 +1169,7 @@ class GnuToolchain(Toolchain):
self.env = self.tc.get_env()
if self.tc.is_clang:
+ if self.tc.is_from_arcadia:
self.env.setdefault(build.host.library_path_variable, []).append('{}/lib'.format(self.tc.name_marker))
target_triple = select(default=None, selectors=[
@@ -1202,6 +1203,7 @@ class GnuToolchain(Toolchain):
self.c_flags_platform.append('-mfpu=neon')
self.c_flags_platform.extend(('-fexceptions', '-fsigned-char'))
+ if self.tc.is_from_arcadia:
if target.is_apple:
if target.is_ios:
self.setup_sdk(project='build/platform/ios_sdk', var='${IOS_SDK_ROOT_RESOURCE_GLOBAL}')
@@ -1540,8 +1542,10 @@ class LD(Linker):
if target.is_apple:
# Use libtool. cctools ar does not understand -M needed for archive merging
self.ar = '${CCTOOLS_ROOT_RESOURCE_GLOBAL}/bin/libtool'
- else:
+ elif self.tc.is_from_arcadia:
self.ar = '{}/bin/llvm-ar'.format(self.tc.name_marker)
+ else:
+ self.ar = 'ar'
self.ld_flags = filter(None, [preset('LDFLAGS')])
