1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
--- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.000000000 +0100
+++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-04-02 23:33:17.000000000 +0200
@@ -328,7 +328,7 @@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
-build_alias = @build_alias@
+build_alias = ${BUILD_ALIAS}
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -339,7 +339,7 @@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
-host_alias = @host_alias@
+host_alias = ${HOST_ALIAS}
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -362,7 +362,7 @@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
-target_alias = @target_alias@
+target_alias = ${TARGET_ALIAS}
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow
@OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
@OPENJDK_SRC_DIR_FOUND_TRUE@ fi
@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ if ! test -d openjdk ; then \
-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPRl openjdk.hg openjdk ; \
+@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ cp -pPR openjdk.hg openjdk ; \
@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_TRUE@ fi
@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ set -e ; \
@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; \
@@ -1576,7 +1576,7 @@ clean-overlay:
# FIXME (missing): Rename to clone-ecj.
stamps/extract-ecj.stamp: $(OPENJDK_TREE)
if ! test -d openjdk-ecj ; then \
- cp -pPRl openjdk openjdk-ecj ; \
+ cp -pPR openjdk openjdk-ecj ; \
fi
mkdir -p stamps
touch stamps/extract-ecj.stamp
@@ -1642,11 +1642,15 @@ clean-patch-ecj:
# ===========================
stamps/native-ecj.stamp:
- mkdir -p stamps ; \
- if test "x$(GCJ)" != "xno"; then \
- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
- fi ; \
+ mkdir -p stamps ; \
+ if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
+ ln -s "${ADK_ECJ}" native-ecj; \
+ else \
+ if test "x$(GCJ)" != "xno"; then \
+ $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
+ fi ; \
+ fi; \
touch stamps/native-ecj.stamp
clean-native-ecj:
|
