Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 491545 Allow initial DLLFLAGS to be specified on configure command line for Windows builds and fix setting of PDB:NONE. r=mcs,richm

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@257135 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.plus.com 2009-05-08 09:41:52 +00:00
parent 5858049b83
commit ad0007b8be
3 changed files with 156 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/directory/c-sdk/build.mk
View File

@ -444,20 +444,9 @@ LINK_EXE = $(CC_FOR_LINK) -o $@ $(LDFLAGS) $(LCFLAGS) $(DEPLIBS) \
LINK_LIB = $(AR) cr $@ $(OBJS)
LINK_DLL = $(CC_FOR_LINK) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(@:.$(DLL_SUFFIX)=.$(LIB_SUFFIX)) $(LLFLAGS) $(DLL_LDFLAGS) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DLL_LIBS)
else
DEBUG_LINK_OPT=-DEBUG
ifeq ($(BUILD_OPT), 1)
ifndef MOZ_DEBUG_SYMBOLS
DEBUG_LINK_OPT=
endif
DEBUG_LINK_OPT += -OPT:REF
endif
SUBSYSTEM=CONSOLE
ifndef MOZ_DEBUG_SYMBOLS
DEBUG_FLAGS=-PDB:NONE
endif
LINK_EXE = $(CYGWIN_WRAPPER) link $(DEBUG_LINK_OPT) -OUT:"$@" -MAP $(ALDFLAGS) $(LDFLAGS) $(ML_DEBUG) \
LINK_EXE = $(CYGWIN_WRAPPER) link $(DLLFLAGS) -OUT:"$@" -MAP $(ALDFLAGS) $(LDFLAGS) $(ML_DEBUG) \
$(LCFLAGS) -NOLOGO $(DEBUG_FLAGS) -INCREMENTAL:NO \
-NODEFAULTLIB:MSVCRTD -SUBSYSTEM:$(SUBSYSTEM) $(DEPLIBS) \
$(filter %.$(OBJ_SUFFIX),$^) $(OBJS) $(EXTRA_LIBS) $(PLATFORMLIBS) msvcrt.lib
@ -479,7 +468,7 @@ ifndef LD
LD=link
endif
LINK_DLL = $(CYGWIN_WRAPPER) $(LD) $(DEBUG_LINK_OPT) -nologo -MAP -DLL $(DEBUG_FLAGS) \
LINK_DLL = $(CYGWIN_WRAPPER) $(LD) $(DLLFLAGS) -MAP $(OS_DLLFLAGS) \
$(ML_DEBUG) -SUBSYSTEM:$(SUBSYSTEM) $(LLFLAGS) $(DLL_LDFLAGS) \
$(EXTRA_LIBS) -out:"$@" $(OBJS)
endif # NS_USE_GCC

303
mozilla/directory/c-sdk/configure vendored
View File

File diff suppressed because it is too large Load Diff

3
mozilla/directory/c-sdk/configure.in
View File

@ -82,6 +82,7 @@ dnl ========================================================
CFLAGS="${CFLAGS=}"
CXXFLAGS="${CXXFLAGS=}"
LDFLAGS="${LDFLAGS=}"
DLLFLAGS="${DLLFLAGS=}"
HOST_CFLAGS="${HOST_CFLAGS=}"
HOST_LDFLAGS="${HOST_LDFLAGS=}"
@ -1581,7 +1582,7 @@ tools are selected during the Xcode/Developer Tools installation.])
_MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION}
CFLAGS="$CFLAGS -W3 -nologo -GF -Gy"
DLLFLAGS='-OUT:"$@"'
DLLFLAGS="$DLLFLAGS -OUT:'$@'"
_DEBUG_FLAGS=-Z7
_OPTIMIZE_FLAGS=-O2
if test -z "$MOZ_OPTIMIZE"; then