diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2005-09-27 15:23:29 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2005-09-27 15:23:29 +0000 |
| commit | b236426ae51df1c2865c6d3cb0dd3acffe5871f8 (patch) | |
| tree | fa48a8e97eb00d200f2667e9369631251266b62e /java/jdk15 | |
| parent | Cleanup a bit: Move install-logic into Makefile instead of patching it into p... (diff) | |
. Include header files from the JDK that was just built, not from the
bootstrap JDK. This fixes using the Linux JDK to bootstrap when you
are compiling javaws.
Diffstat (limited to 'java/jdk15')
| -rw-r--r-- | java/jdk15/files/patch-deploy::common::DeployRules-solaris.gmk | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-deploy::common::DeployRules-solaris.gmk b/java/jdk15/files/patch-deploy::common::DeployRules-solaris.gmk new file mode 100644 index 000000000000..5cb3c8224a76 --- /dev/null +++ b/java/jdk15/files/patch-deploy::common::DeployRules-solaris.gmk @@ -0,0 +1,17 @@ +$FreeBSD$ + +--- ../../deploy/make/common/DeployRules-solaris.gmk.orig Mon Sep 26 17:20:33 2005 ++++ ../../deploy/make/common/DeployRules-solaris.gmk Mon Sep 26 17:25:34 2005 +@@ -43,10 +43,10 @@ + $(CP) $(DEPLOY_COMMON_SO_DBG) $(DEPLOY_OUTPUT_LIB_DBG) + + $(DEPLOYOBJDIR)/%.o: $(DEPLOY_PLATFORM_SRC)/native/%.c +- $(CXX) -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@ ++ $(CXX) -I$(OUTPUTDIR)/include -I$(OUTPUTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@ + + $(DEPLOYOBJDIR_DBG)/%.o: $(DEPLOY_PLATFORM_SRC)/native/%.c +- $(CXX) -g -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@ ++ $(CXX) -g -I$(OUTPUTDIR)/include -I$(OUTPUTDIR)/include/$(TRUE_PLATFORM_INCLUDE) -c $? -o $@ + + deploy-so-mkdir: + $(MKDIR) -p $(DEPLOYOBJDIR) $(DEPLOYOBJDIR_DBG) $(COMMON_LIB_DIR) $(COMMON_LIB_DIR_DBG) |