diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-01-05 00:47:13 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-01-05 00:47:13 +0000 |
| commit | dcd257c90366362662f8ee426198813f6311ece1 (patch) | |
| tree | 096a29fb47b0905583410295ef80022a791c109c /sdk | |
| parent | 23e101d7e387d37261dd53858ae1b515225c2bac (diff) | |
| download | toolchains-dcd257c90366362662f8ee426198813f6311ece1.tar.gz toolchains-dcd257c90366362662f8ee426198813f6311ece1.tar.bz2 | |
Move nspr so it is only built for Spidermonkey 1.8.5
Diffstat (limited to 'sdk')
| -rw-r--r-- | sdk/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index a13eb65..05f01c2 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -91,6 +91,7 @@ ifeq ($(TARGET),arm-unknown-riscos) EXTRAARGS_SPIDERMONKEY := BUILD_OPT=1 OS_ARCH=RISCOS OS_CPUARCH=arm OS_CONFIG=RISCOS else EXTRAARGS_SPIDERMONKEY := --disable-tracejit --disable-thumb2 --without-thumb --enable-static --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests --disable-methodjit + SDK_ITEMS += $(addprefix $(BUILDSTEPS)/, spidermonkey.d) endif endif @@ -496,7 +497,7 @@ $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz: # spidermonkey (libmozjs) -$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr.d $(BUILDSTEPS)/spidermonkey-src.d +$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/spidermonkey-src.d ifeq ($(VERSION_SPIDERMONKEY),1.7.0) $(env) make -C $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src -f Makefile.ref JS_DIST=$(GCCSDK_INSTALL_ENV) $(EXTRAARGS_SPIDERMONKEY) $(env) make -C $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src -f Makefile.ref JS_DIST=$(GCCSDK_INSTALL_ENV) $(EXTRAARGS_SPIDERMONKEY) export |