diff options
author | Richard Purdie <richard@openedhand.com> | 2007-06-18 17:28:11 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-06-18 17:28:11 +0000 |
commit | b6dc9fc15ac87911aac1dd8fa0ff7ee2c54399d7 (patch) | |
tree | 7a7e0ba2014ac17ac76992ebc285ee24fc351768 /meta/packages/js/files | |
parent | 9dbe065a251e02e4cc3051e55769381eb608657a (diff) | |
download | poky-b6dc9fc15ac87911aac1dd8fa0ff7ee2c54399d7.tar.gz |
js: Use gcc for linking so LDFLAGS can be used in full rather that hardcoded subsets
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1968 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/js/files')
-rw-r--r-- | meta/packages/js/files/host-cc.patch | 16 | ||||
-rw-r--r-- | meta/packages/js/files/link_with_gcc.patch | 13 |
2 files changed, 13 insertions, 16 deletions
diff --git a/meta/packages/js/files/host-cc.patch b/meta/packages/js/files/host-cc.patch deleted file mode 100644 index 78a1e1b5a0..0000000000 --- a/meta/packages/js/files/host-cc.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | diff -urNd smjs-1.5-r0/js/src/Makefile.ref smjs-1.5-r0.new/js/src/Makefile.ref | ||
2 | --- smjs-1.5-r0/js/src/Makefile.ref 2003-11-15 00:10:55.000000000 +0000 | ||
3 | +++ smjs-1.5-r0.new/js/src/Makefile.ref 2006-01-31 23:43:16.000000000 +0000 | ||
4 | @@ -317,8 +317,11 @@ | ||
5 | rm -f $@ | ||
6 | $(OBJDIR)/jscpucfg > $@ | ||
7 | |||
8 | +$(OBJDIR)/jscpucfg.o: jscpucfg.c jscpucfg.h | ||
9 | + $(HOST_CC) -o $@ $(CFLAGS) $(LDFLAGS) jscpucfg.c | ||
10 | + | ||
11 | $(OBJDIR)/jscpucfg: $(OBJDIR)/jscpucfg.o | ||
12 | - $(CC) -o $@ $(OBJDIR)/jscpucfg.o | ||
13 | + $(HOST_CC) -o $@ $(OBJDIR)/jscpucfg.o | ||
14 | |||
15 | # Look in OBJDIR to find jsautocfg.h | ||
16 | INCLUDES += -I$(OBJDIR) | ||
diff --git a/meta/packages/js/files/link_with_gcc.patch b/meta/packages/js/files/link_with_gcc.patch new file mode 100644 index 0000000000..d74b94f378 --- /dev/null +++ b/meta/packages/js/files/link_with_gcc.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: src/config/Linux_All.mk | ||
2 | =================================================================== | ||
3 | --- src.orig/config/Linux_All.mk 2005-05-10 19:53:44.000000000 +0000 | ||
4 | +++ src/config/Linux_All.mk 2007-06-18 17:20:05.000000000 +0000 | ||
5 | @@ -47,7 +47,7 @@ | ||
6 | OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R | ||
7 | |||
8 | RANLIB = echo | ||
9 | -MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) | ||
10 | +MKSHLIB = $(CC) -shared $(XMKSHLIBOPTS) | ||
11 | |||
12 | #.c.o: | ||
13 | # $(CC) -c -MD $*.d $(CFLAGS) $< | ||