Changeset 323

Timestamp:

Feb 16, 2012, 5:54:39 PM (13 years ago)

Author:

dmik

Message:

hotspot: launcher: Don't redefine general linker flags.

File:

• trunk/openjdk/hotspot/make/os2/makefiles/launcher.make (modified) (3 diffs)

trunk/openjdk/hotspot/make/os2/makefiles/launcher.make

@@ -24 +24 @@
 
 
-LAUNCHER_FLAGS = $(CPP_FLAGS) $(ARCHFLAG) \
+LAUNCHER_FLAGS = $(ARCHFLAG) \
         -DFULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
         -DJDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
@@ -40 +40 @@
         -I$(WorkSpace)\src\os\windows\vm
 
-LINK_FLAGS += -l$(HS_INTERNAL_NAME).lib -g -Zlinker /PM:VIO
+LAUNCHER_LINK_FLAGS += -l$(HS_INTERNAL_NAME).lib -g -Zlinker /PM:VIO
 
 LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher
@@ -58 +58 @@
 
 $(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR_SHARE)/%.c | launcher-out
-        $(QUIETLY) $(CXX) $(CXXFLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
+        $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
 
 $(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR)/%.c | launcher-out
-        $(QUIETLY) $(CXX) $(CXXFLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
+        $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
 
 launcher: $(OBJS)
         echo $(JAVA_HOME) > jdkpath.txt  
-        $(LINK) $(LINK_FLAGS) -o hotspot.exe $(OBJS)
+        $(LINK) $(LINK_FLAGS) $(LAUNCHER_LINK_FLAGS) -o hotspot.exe $(OBJS)