projects
/
openwrt
/
staging
/
blogic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
firmware-utils/mksercommfw: fix build with clang/macOS
[openwrt/staging/blogic.git]
/
rules.mk
diff --git
a/rules.mk
b/rules.mk
index a97b2d2155695c3a15f361ea2fe95b977be05959..d90e0ffed09867bc3f39278b7109cdfa523391f1 100644
(file)
--- a/
rules.mk
+++ b/
rules.mk
@@
-141,6
+141,10
@@
endif
ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
iremap = -iremap$(1):$(2)
ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
iremap = -iremap$(1):$(2)
+ # just overwrite iremap for GCC 8.1 and higher to keep backward compatibility
+ ifeq ($(CONFIG_GCC_VERSION_8),y)
+ iremap = -fmacro-prefix-map=$(1)=$(2)
+ endif
endif
PACKAGE_DIR:=$(BIN_DIR)/packages
endif
PACKAGE_DIR:=$(BIN_DIR)/packages
@@
-390,8
+394,9
@@
endef
# Calculate sha256sum of any plain file within a given directory
# $(1) => Input directory
# Calculate sha256sum of any plain file within a given directory
# $(1) => Input directory
+# $(2) => If set, recurse into subdirectories
define sha256sums
define sha256sums
- (cd $(1); find .
-maxdepth 1
-type f -not -name 'sha256sums' -printf "%P\n" | sort | \
+ (cd $(1); find .
$(if $(2),,-maxdepth 1)
-type f -not -name 'sha256sums' -printf "%P\n" | sort | \
xargs -r $(STAGING_DIR_HOST)/bin/mkhash -n sha256 | sed -ne 's!^\(.*\) \(.*\)$$!\1 *\2!p' > sha256sums)
endef
xargs -r $(STAGING_DIR_HOST)/bin/mkhash -n sha256 | sed -ne 's!^\(.*\) \(.*\)$$!\1 *\2!p' > sha256sums)
endef