Remove redundant linker options added in r379049.
This commit is contained in:
parent
be3f310a3a
commit
ea9a2868cf
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=379124
1 changed files with 2 additions and 2 deletions
|
@ -31,7 +31,7 @@
|
|||
LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
|
||||
$(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
|
||||
LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
|
||||
+ LDFLAGS_SUFFIX_bsd := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
|
||||
+ LDFLAGS_SUFFIX_bsd := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lc, \
|
||||
LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
|
||||
OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
|
||||
|
@ -48,7 +48,7 @@
|
|||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LDFLAGS_linux := -lc, \
|
||||
LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
|
||||
+ LDFLAGS_bsd := -lstdc++ -lc, \
|
||||
+ LDFLAGS_bsd := -lc, \
|
||||
LDFLAGS_SUFFIX := $(LIBCXX), \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
|
||||
OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
|
||||
|
|
Loading…
Reference in a new issue