Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdef43d6 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Switch to toybox stat on macOS too."

parents c271afeb 2e51a155

core/combo/HOST_darwin-x86_64.mk

+0 −5
Original line number Diff line number Diff line
@@ -59,8 +59,3 @@ $(hide) $(PRIVATE_CXX) \ 
        $(PRIVATE_LDFLAGS) \

        $(PRIVATE_LDLIBS)

endef
 


# $(1): The file to check

define get-file-size

stat -f "%z" $(1)

endef

core/combo/HOST_linux-x86.mk

+0 −5
Original line number Diff line number Diff line
@@ -23,8 +23,3 @@ endef 


############################################################

## Macros after this line are shared by the 64-bit config.
 


# $(1): The file to check

define get-file-size

stat -c "%s" "$(1)" | tr -d '\n'

endef

core/definitions.mk

+3 −3
Original line number Diff line number Diff line
@@ -2678,9 +2678,9 @@ endef 
###########################################################



# $(1): The file to check

ifndef get-file-size

$(error HOST_OS must define get-file-size)

endif

define get-file-size

stat -c "%s" "$(1)" | tr -d '\n'

endef



# $(1): The file(s) to check (often $@)

# $(2): The partition size.