Skip to content

Commit 0580ab9

Browse files
committed
chore(make): drop unnecessary MAKE_SHELL variable
Status-App Test PR: status-im/status-app#21027 Signed-off-by: Jakub Sokołowski <jakub@status.im>
1 parent 8082fea commit 0580ab9

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

Makefile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ else
4444
detected_OS := $(strip $(shell uname))
4545
endif
4646

47-
ifeq ($(detected_OS),Windows)
48-
MAKE_SHELL := bash
49-
else
50-
MAKE_SHELL := /bin/bash
51-
endif
52-
5347
ifeq ($(MAKECMDGOALS),statusgo-android-library)
5448
ARCH ?= arm64
5549
ANDROID_NDK_ROOT ?= $(shell find /nix/store -path "*android-sdk-ndk-27.2.12479018/libexec/android-sdk/ndk/27.2.12479018" -type d 2>/dev/null | head -1)
@@ -309,7 +303,7 @@ $(LIBSDS): clone-nim-sds
309303
ifeq ($(NIM_SDS_BUILD_FROM_SOURCE),true)
310304
@echo "Building nim-sds: $(LIBSDS)"
311305
$(MAKE) -C $(NIM_SDS_SOURCE_DIR) update USE_SYSTEM_NIM=$(USE_SYSTEM_NIM)
312-
$(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds USE_SYSTEM_NIM=$(USE_SYSTEM_NIM) NIMFLAGS=-d:noSignalHandler SHELL=$(MAKE_SHELL)
306+
$(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds USE_SYSTEM_NIM=$(USE_SYSTEM_NIM) NIMFLAGS=-d:noSignalHandler
313307
else
314308
@test -f $(LIBSDS) || (echo "Error: libsds not found at $(LIBSDS)" && exit 1)
315309
endif
@@ -326,11 +320,11 @@ build-libsds-android: SDSARCH = $(strip $(if $(filter arm64,$(ARCH)),arm64,\
326320
$(error Unsupported ARCH '$(ARCH)'. Please set ARCH to one of: arm64, arm, amd64, x86, x86_64))))))
327321
build-libsds-android: clone-nim-sds
328322
@echo "Building nim-sds for Android" $(LIBSDS)
329-
$(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-android ARCH=$(SDSARCH) ANDROID_NDK_ROOT=$(ANDROID_NDK_ROOT) USE_SYSTEM_NIM=1 SHELL=$(MAKE_SHELL)
323+
$(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-android ARCH=$(SDSARCH) ANDROID_NDK_ROOT=$(ANDROID_NDK_ROOT) USE_SYSTEM_NIM=1
330324

331325
build-libsds-ios: clone-nim-sds
332326
@echo "Building nim-sds for iOS" $(LIBSDS)
333-
$(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-ios USE_SYSTEM_NIM=$(USE_SYSTEM_NIM) SHELL=$(MAKE_SHELL)
327+
$(MAKE) -C $(NIM_SDS_SOURCE_DIR) libsds-ios USE_SYSTEM_NIM=$(USE_SYSTEM_NIM)
334328

335329
clean-libsds:
336330
@echo "Removing libsds"

0 commit comments

Comments
 (0)