Commit bde58551 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

nodejs: use the standard configure/make options 



Also cleanup leading whitespace.

Note that overloading LD in required to avoid linker failures.

Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 8813aa2f

package/nodejs/nodejs.mk

+9 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ define HOST_NODEJS_CONFIGURE_CMDS 
	# NPM is non-functional without it, and host-openssl isn't part of

	# buildroot.

	(cd $(@D); \

		$(HOST_CONFIGURE_OPTS) \

		./configure \

		--prefix=$(HOST_DIR)/usr \

		--without-snapshot \
@@ -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