Changeset 178 for trunk/openjdk/jdk/make/common/Defs.gmk

Timestamp:

Nov 24, 2010, 5:59:13 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Make sure Java include dirs are listed first because there are name conflicts with Odin include files (e.g. region.h).

File:

• trunk/openjdk/jdk/make/common/Defs.gmk (modified) (2 diffs)

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

@@ -428 +428 @@
 INCLUDES = -I. -I$(CLASSHDRDIR) \
         $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES)
+ifneq ($(PLATFORM), os2)
 OTHER_CPPFLAGS = $(INCLUDES)
-
+endif
 
 #
@@ -665 +666 @@
 CFLAGS          = $(CFLAGS_$(VARIANT)/BYFILE)   $(CFLAGS_COMMON) $(OTHER_CFLAGS)
 CXXFLAGS        = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
+ifeq ($(PLATFORM), os2)
+CPPFLAGS        = $(INCLUDES) $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
+                  $(DEFINES) $(OPTIONS:%=-D%)
+else
 CPPFLAGS        = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
                   $(DEFINES) $(OPTIONS:%=-D%)
+endif             
 LDFLAGS         = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS)
 LDLIBS          = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON)