diff options
| author | Samuel Martin <s.martin49@gmail.com> | 2014-04-15 00:09:47 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-15 23:17:10 +0200 |
| commit | bde585518e305e8dac19c1b0541ca2ae9ba65e91 (patch) | |
| tree | 5274efc66e4a0062da9130c16b32573456c9c110 /package/nodejs | |
| parent | 8813aa2f898986262aac44979af45b7a22bb2b20 (diff) | |
| download | buildroot-bde585518e305e8dac19c1b0541ca2ae9ba65e91.tar.gz buildroot-bde585518e305e8dac19c1b0541ca2ae9ba65e91.zip | |
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>
Diffstat (limited to 'package/nodejs')
| -rw-r--r-- | package/nodejs/nodejs.mk | 12 |
1 files 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 |
