diff --git a/build-system/Make/ProjectGeneration.py b/build-system/Make/ProjectGeneration.py index 046ee4d9bd..05a326f441 100644 --- a/build-system/Make/ProjectGeneration.py +++ b/build-system/Make/ProjectGeneration.py @@ -24,6 +24,7 @@ def generate_xcodeproj(build_environment: BuildEnvironment, disable_extensions, bazel_generate_arguments += ['--override_repository=build_configuration={}'.format(configuration_path)] if disable_extensions: bazel_generate_arguments += ['--//{}:disableExtensions'.format(app_target)] + bazel_generate_arguments += ['--//{}:disableStripping'.format('Telegram')] project_bazel_arguments = [] for argument in bazel_app_arguments: @@ -31,6 +32,7 @@ def generate_xcodeproj(build_environment: BuildEnvironment, disable_extensions, project_bazel_arguments += ['--override_repository=build_configuration={}'.format(configuration_path)] if disable_extensions: project_bazel_arguments += ['--//{}:disableExtensions'.format(app_target)] + project_bazel_arguments += ['--//{}:disableStripping'.format('Telegram')] xcodeproj_bazelrc = os.path.join(build_environment.base_path, 'xcodeproj.bazelrc') if os.path.isfile(xcodeproj_bazelrc): diff --git a/build-system/bazel-rules/rules_xcodeproj b/build-system/bazel-rules/rules_xcodeproj index dc226d129a..7f600ddd7c 160000 --- a/build-system/bazel-rules/rules_xcodeproj +++ b/build-system/bazel-rules/rules_xcodeproj @@ -1 +1 @@ -Subproject commit dc226d129aca2237982b98a95c80ed1ccc74f0c5 +Subproject commit 7f600ddd7cb3ebc59c696a4639b84b93267c7b6e diff --git a/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh index 50f4990e21..95404823f2 100755 --- a/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh +++ b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh @@ -181,7 +181,7 @@ then echo "$CONFIGURE_FLAGS" > "$CONFIGURED_MARKER" fi - CORE_COUNT=`sysctl -n hw.logicalcpu` + CORE_COUNT=`PATH="$PATH:/usr/sbin" sysctl -n hw.logicalcpu` make -j$CORE_COUNT install $EXPORT || exit 1 popd diff --git a/third-party/yasm/BUILD b/third-party/yasm/BUILD index 38efc12b07..bc405ece85 100644 --- a/third-party/yasm/BUILD +++ b/third-party/yasm/BUILD @@ -9,7 +9,7 @@ genrule( cmd_bash = """ set -x - core_count="`sysctl -n hw.logicalcpu`" + core_count=`PATH="$$PATH:/usr/sbin" sysctl -n hw.logicalcpu` BUILD_DIR="$(RULEDIR)/build" rm -rf "$$BUILD_DIR" mkdir -p "$$BUILD_DIR"