projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
18c81fd
)
2003/09/28 21:37:19
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:38:37 +0000
(07:38 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:38:37 +0000
(07:38 +0000)
darcs-hash:
20040130073837
-2ba56-
c11f1a7515dcab10e8ef52c907cfca1c17a03f2c
.gz
Makefile
patch
|
blob
|
history
Makefile.upstream
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
14e2463
..
9b5456f
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-156,7
+156,7
@@
build/$(platform)/builtin.o: build/res/builtin.jar
# compile is here to force compilation of the .class files (they get used via -Ibuild) without
# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
# compile is here to force compilation of the .class files (they get used via -Ibuild) without
# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
-gcj: .vendor .install_gcc-3.3_$(target) $(target_bin)
+gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin)
build/JVM/xwt.jar: .compile build/res/builtin.jar
@echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m"
build/JVM/xwt.jar: .compile build/res/builtin.jar
@echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m"
diff --git
a/Makefile.upstream
b/Makefile.upstream
index
28395cd
..
8142661
100644
(file)
--- a/
Makefile.upstream
+++ b/
Makefile.upstream
@@
-67,8
+67,6
@@
configure_gcc-3.3 += --disable-java-awt --disable-interpre
ifneq ($(shell uname),$(platform))
configure_gcc-3.3 += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
ifneq ($(shell uname),$(platform))
configure_gcc-3.3 += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
-endif
-ifneq ($(target),mips-unknown-elf)
configure_gcc-3.3 += --with-headers=$(shell pwd)/upstream/install/$(target)/include
endif
configure_gcc-3.3_powerpc-apple-darwin += --enable-threads=posix --disable-hash-synchronization --disable-multilib
configure_gcc-3.3 += --with-headers=$(shell pwd)/upstream/install/$(target)/include
endif
configure_gcc-3.3_powerpc-apple-darwin += --enable-threads=posix --disable-hash-synchronization --disable-multilib
@@
-104,6
+102,10
@@
vendor: .vendor; @true
mkdir -p upstream/install/i686-pc-mingw32
curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
mkdir -p upstream/install/i686-pc-mingw32
curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
+ifeq($(shell uname),Linux)
+ rm -rf upstream/install/i686-pc-linux-gnu/include
+ ln -sf /usr/include upstream/install/i686-pc-linux-gnu/include
+endif
touch .vendor
.download_%:
touch .vendor
.download_%: