diff options
| author | paltherr <paltherr@epfl.ch> | 2003-05-05 14:39:43 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-05-05 14:39:43 +0000 |
| commit | 0478f7197ff4d01d87b7199aa187343824f4badb (patch) | |
| tree | 7412fef025d20245c4fa20117f700cc357b4821c /support | |
| parent | f3aeae44c269d9b40afd58c109a2f6e5ccc9ba03 (diff) | |
| download | scala-0478f7197ff4d01d87b7199aa187343824f4badb.tar.gz scala-0478f7197ff4d01d87b7199aa187343824f4badb.tar.bz2 scala-0478f7197ff4d01d87b7199aa187343824f4badb.zip | |
- Modified to use definitions from cygwin.mk
Diffstat (limited to 'support')
| -rw-r--r-- | support/make/jc.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/support/make/jc.mk b/support/make/jc.mk index 4e5d77c98a..34251c4d95 100644 --- a/support/make/jc.mk +++ b/support/make/jc.mk @@ -55,8 +55,9 @@ ############################################################################## # Defaults -JC_CYGWIN ?= $(filter CYGWIN%,$(shell uname)) JC_COMPILER ?= JAVAC +CYGWIN_PATH ?= $(1) +CYGWIN_FILE ?= $(1) JAVAC ?= javac ############################################################################## @@ -82,22 +83,20 @@ jc_FILES = $(call JC_LOOKUP,JC_FILES) jc += $(jc_compiler) jc += $(jc_compiler_flags) jc += $(jc_FLAGS) -jc += $(jc_CLASSPATH:%=-classpath $(call JC_CYGPATH,%)) -jc += $(jc_SOURCEPATH:%=-sourcepath $(call JC_CYGPATH,%)) -jc += $(jc_BOOTCLASSPATH:%=-bootclasspath $(call JC_CYGPATH,%)) -jc += $(jc_EXTDIRS:%=-extdirs $(call JC_CYGPATH,%)) -jc += $(jc_OUTPUTDIR:%=-d $(call JC_CYGFILE,%)) +jc += $(jc_CLASSPATH:%=-classpath $(call CYGWIN_PATH,%)) +jc += $(jc_SOURCEPATH:%=-sourcepath $(call CYGWIN_PATH,%)) +jc += $(jc_BOOTCLASSPATH:%=-bootclasspath $(call CYGWIN_PATH,%)) +jc += $(jc_EXTDIRS:%=-extdirs $(call CYGWIN_PATH,%)) +jc += $(jc_OUTPUTDIR:%=-d $(call CYGWIN_FILE,%)) jc += $(jc_ENCODING:%=-encoding %) jc += $(jc_SOURCE:%=-source %) jc += $(jc_TARGET:%=-target %) -jc += $(jc_FILES:%=$(call JC_CYGFILE,%)) +jc += $(jc_FILES:%=$(call CYGWIN_FILE,%)) ############################################################################## # Functions JC_LOOKUP = $(if $($(target)_$(1)),$($(target)_$(1)),$($(1))) -JC_CYGPATH = $(if $(JC_CYGWIN),`cygpath -w -p $(1)`,$(1)) -JC_CYGFILE = $(if $(JC_CYGWIN),`cygpath -w $(1)`,$(1)) ############################################################################## # Rules |