diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-01-05 12:40:04 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-01-05 12:40:04 +0000 |
| commit | fdb38bf7d602b47650e7ef845f0e5da50671dd06 (patch) | |
| tree | 10aa2506ea9867ffb8493dc6279af844b3f6f433 /sdk/Makefile | |
| parent | 710dbb67c521e96f1ee32c6ba1981150b886a677 (diff) | |
| parent | 0d8b7d2a79f02911a8b2408369afe5636c4d6862 (diff) | |
| download | toolchains-fdb38bf7d602b47650e7ef845f0e5da50671dd06.tar.gz toolchains-fdb38bf7d602b47650e7ef845f0e5da50671dd06.tar.bz2 | |
Merge branch 'chris/os4-spidermonkey'
Patches for Spidermonkey 1.7 on ppc-amigaos
Diffstat (limited to 'sdk/Makefile')
| -rw-r--r-- | sdk/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index a13eb65..c2ae79e 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)/, nspr.d) endif endif @@ -111,7 +112,7 @@ ifeq ($(TARGET),m5475-atari-mint) endif ifeq ($(TARGET),ppc-amigaos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS)) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d spidermonkey.d $(COMMON_SDK_ITEMS)) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random VERSION_SPIDERMONKEY := 1.7.0 @@ -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 |