projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better
[org.ibex.core.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
7f3c4dc
..
5fb91ff
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-286,7
+286,12
@@
build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a
cd upstream/gcc-3.3/build-$(target)/$(target)/libjava; \
$(shell pwd)/upstream/install/$(target)/bin/ar cq \
$(shell pwd)/build/$(platform)/ibex.a \
cd upstream/gcc-3.3/build-$(target)/$(target)/libjava; \
$(shell pwd)/upstream/install/$(target)/bin/ar cq \
$(shell pwd)/build/$(platform)/ibex.a \
- `find $(shell pwd)/build/$(platform) -name \*.o` \
+ `find $(shell pwd)/build/$(platform) -name \*.o`
+
+ rm -f build/$(platform)/natibex.a
+ cd upstream/gcc-3.3/build-$(target)/$(target)/libjava; \
+ $(shell pwd)/upstream/install/$(target)/bin/ar cq \
+ $(shell pwd)/build/$(platform)/natibex.a \
`cat $(shell pwd)/.natbins`
# --relax,-O2,--no-whole-archive,
PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \
`cat $(shell pwd)/.natbins`
# --relax,-O2,--no-whole-archive,
PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \
@@
-296,9
+301,10
@@
build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a
-Lupstream/install/$(target)/lib \
-Lupstream/install/lib \
-Os -w \
-Lupstream/install/$(target)/lib \
-Lupstream/install/lib \
-Os -w \
- -Wl,--whole-archive \
+ -Wl,--whole-archive \
build/$(platform)/ibex.a \
build/$(platform)/ibex.a \
- -Wl,--no-whole-archive \
+ -Wl,--no-whole-archive \
+ build/$(platform)/natibex.a \
upstream/jpeg-6b/build-$(target)/libjpeg.a \
$(link_flags) \
upstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/.libs/libgcjgc.a \
upstream/jpeg-6b/build-$(target)/libjpeg.a \
$(link_flags) \
upstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/.libs/libgcjgc.a \