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 <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index a44bfbd63066e8cb229feb22088f0da12198b377..46b3056ab339a44b3991039cc06db6951d7e5eaf 100644 (file)
--- 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