Line 0
Link Here
|
|
|
1 |
--- openjdk/hotspot/make/linux/makefiles/sa.make 2009-02-09 14:19:11.629530588 +0000 |
2 |
+++ openjdk/hotspot/make/linux/makefiles/sa.make 2009-02-09 14:18:35.121086328 +0000 |
3 |
@@ -42,8 +42,6 @@ |
4 |
|
5 |
# gnumake 3.78.1 does not accept the *s that |
6 |
# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them |
7 |
-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) |
8 |
-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) |
9 |
|
10 |
SA_CLASSDIR = $(GENERATED)/saclasses |
11 |
|
12 |
@@ -74,8 +72,11 @@ |
13 |
mkdir -p $(SA_CLASSDIR); \ |
14 |
fi |
15 |
|
16 |
- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1) |
17 |
- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2) |
18 |
+ echo $(AGENT_FILES1) > t1 |
19 |
+ echo $(AGENT_FILES2) > t2 |
20 |
+ |
21 |
+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @t1 |
22 |
+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @t2 |
23 |
|
24 |
$(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer |
25 |
$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) |