Changeset 219 for trunk/openjdk/jdk/make/common/Defs-os2.gmk

Timestamp:

Dec 29, 2010, 1:05:09 PM (15 years ago)

Author:

dmik

Message:

make: Add support for ILINK and forbid using WLINK for JDK due to bugs in internal fixup generation when building awt.dll (see #35).

File:

• trunk/openjdk/jdk/make/common/Defs-os2.gmk (modified) (1 diff)

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

@@ -156 +156 @@
 # Linker options
 #
-LDFLAGS_COMMON  = -Zomf -Zmap -Zstack 0x2000 -Zlinker "DISABLE 1121" -Zhigh-mem -Zno-fork -Zno-unix
+LDFLAGS_COMMON  = -Zomf -Zmap -Zstack 0x2000 -Zhigh-mem -Zno-fork -Zno-unix
 LDFLAGS_OPT     = -s
 LDFLAGS_DBG     =
+
+ifeq ($(EMXOMFLD_TYPE), WLINK)
+  LDFLAGS_COMMON += -Zlinker "DISABLE 1121"
+endif
 
 #