Changeset 323


Ignore:
Timestamp:
Feb 16, 2012, 4:54:39 PM (9 years ago)
Author:
dmik
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk/hotspot/make/os2/makefiles/launcher.make

    r311 r323  
    2424
    2525
    26 LAUNCHER_FLAGS = $(CPP_FLAGS) $(ARCHFLAG) \
     26LAUNCHER_FLAGS = $(ARCHFLAG) \
    2727        -DFULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
    2828        -DJDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
     
    4040        -I$(WorkSpace)\src\os\windows\vm
    4141
    42 LINK_FLAGS += -l$(HS_INTERNAL_NAME).lib -g -Zlinker /PM:VIO
     42LAUNCHER_LINK_FLAGS += -l$(HS_INTERNAL_NAME).lib -g -Zlinker /PM:VIO
    4343
    4444LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher
     
    5858
    5959$(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR_SHARE)/%.c | launcher-out
    60         $(QUIETLY) $(CXX) $(CXXFLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
     60        $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
    6161
    6262$(LAUNCHER_OUT)/%.obj: $(LAUNCHERDIR)/%.c | launcher-out
    63         $(QUIETLY) $(CXX) $(CXXFLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
     63        $(QUIETLY) $(CXX) $(CXX_FLAGS) -g -o $@ -c $< -MMD $(LAUNCHER_FLAGS)
    6464
    6565launcher: $(OBJS)
    6666        echo $(JAVA_HOME) > jdkpath.txt 
    67         $(LINK) $(LINK_FLAGS) -o hotspot.exe $(OBJS)
     67        $(LINK) $(LINK_FLAGS) $(LAUNCHER_LINK_FLAGS) -o hotspot.exe $(OBJS)
    6868
    6969
Note: See TracChangeset for help on using the changeset viewer.