Changeset 27 for trunk/openjdk/jdk/make/common/Library.gmk

Timestamp:

Jun 17, 2010, 4:08:35 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Integrate Odin SDK to the compiler/linker definitions and require a valid path to it to be set.

File:

• trunk/openjdk/jdk/make/common/Library.gmk (modified) (5 diffs)

trunk/openjdk/jdk/make/common/Library.gmk

@@ -40 +40 @@
 
 ifeq ($(LIBRARY), fdlibm)
-ifeq ($(PLATFORM),windows)
+ifeq ($(filter-out windows os2,$(PLATFORM)),)
 ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY).$(FDDLIBM_SUFFIX)
 ACTUAL_LIBRARY_DIR = $(OBJDIR)
@@ -177 +177 @@
                 @$(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(LDLIBS_COMMON)
 else # LIBRARY
-# build it into $(OBJDIR) so that the other generated files get put 
+# build it into $(OBJDIR) so that the other generated files get put
 # there, then copy just the DLL (and MAP file) to the requested directory.
 #
@@ -196 +196 @@
         @$(prep-target)
         @$(MKDIR) -p $(TEMPDIR)
-        @$(ECHO) $(FILES_o) > $@ 
+        @$(ECHO) $(FILES_o) > $@
 ifndef LOCAL_RESOURCE_FILE
         @$(ECHO) $(OBJDIR)/$(LIBRARY).res >> $@
 endif
-        @$(ECHO) Created $@ 
+        @$(ECHO) Created $@
 
 # J2SE name required here
@@ -219 +219 @@
 $(ACTUAL_LIBRARY):: $(LIBDIR)/$(LIBRARY).lib
 
-clean:: 
+clean::
         -$(RM) $(LIBDIR)/$(LIBRARY).lib
 
@@ -257 +257 @@
 ifeq ($(PLATFORM),solaris)
 lint.errors : $(FILES_ln)
-        $(LINT.c) $(FILES_ln) $(LDLIBS) 
+        $(LINT.c) $(FILES_ln) $(LDLIBS)
 endif