From bde585518e305e8dac19c1b0541ca2ae9ba65e91 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Tue, 15 Apr 2014 00:09:47 +0200 Subject: [PATCH] nodejs: use the standard configure/make options Also cleanup leading whitespace. Note that overloading LD in required to avoid linker failures. Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index a44bfbd630..46b3056ab3 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -23,7 +23,8 @@ define HOST_NODEJS_CONFIGURE_CMDS # NPM is non-functional without it, and host-openssl isn't part of # buildroot. (cd $(@D); \ - ./configure \ + $(HOST_CONFIGURE_OPTS) \ + ./configure \ --prefix=$(HOST_DIR)/usr \ --without-snapshot \ --without-dtrace \ @@ -75,7 +76,9 @@ define NODEJS_CONFIGURE_CMDS endef define NODEJS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + $(TARGET_CONFIGURE_OPTS) \ + LD="$(TARGET_CXX)" endef # @@ -107,7 +110,10 @@ endef endif define NODEJS_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \ + DESTDIR=$(TARGET_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + LD="$(TARGET_CXX)" $(NODEJS_INSTALL_MODULES) endef -- 2.30.2