projects
/
openwrt
/
staging
/
jow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b5980f
)
toolchain/nasm: fix missing AR/RANLIB variables
author
Felix Fietkau
<
[email protected]
>
Sat, 7 Jul 2018 12:50:51 +0000
(14:50 +0200)
committer
Jo-Philipp Wich
<
[email protected]
>
Tue, 18 Dec 2018 16:32:19 +0000
(17:32 +0100)
Fixes build on macOS
Signed-off-by: Felix Fietkau <
[email protected]
>
(backported from
d3a7587eb95e6e8c85ff0e57504bc31d1e1b8523
)
toolchain/nasm/Makefile
patch
|
blob
|
history
diff --git
a/toolchain/nasm/Makefile
b/toolchain/nasm/Makefile
index a39c71f65fac7395cf51ef44ff9e54220cf34516..8d071033c7dc5ba08aa50520f1663541a5051035 100644
(file)
--- a/
toolchain/nasm/Makefile
+++ b/
toolchain/nasm/Makefile
@@
-24,6
+24,10
@@
HOST_CONFIGURE_ARGS+= \
--disable-gdb \
$(SOFT_FLOAT_CONFIG_OPTION) \
+HOST_MAKE_FLAGS = \
+ AR=ar \
+ RANLIB=ranlib
+
define Host/Prepare
$(call Host/Prepare/Default)
ln -snf $(notdir $(HOST_BUILD_DIR)) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
@@
-37,12
+41,9
@@
define Host/Configure
$(call Host/Configure/Default)
endef
-define Host/Compile
- +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all
-endef
-
define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) \
+ $(HOST_MAKE_FLAGS) \
prefix=$(TOOLCHAIN_DIR) \
install
endef