Skip to content

Commit

Permalink
Revert "Merge 'build-pdb' into HEAD"
Browse files Browse the repository at this point in the history
Fixes git-for-windows/git#356

This reverts commit 27e5516, reversing
changes made to a1a4754.

Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
  • Loading branch information
dakotahawkins committed Jul 22, 2018
1 parent f02cd24 commit 7332baf
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions winsup/cygwin/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ install-libs: $(TARGET_LIBS)
for i in $^; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/lib/`basename $$i` ; \
done
$(INSTALL_DATA) msys-2.0.pdb $(DESTDIR)$(bindir)/msys-2.0.pdb
$(INSTALL_DATA) msys-2.0.dbg $(DESTDIR)$(bindir)/msys-2.0.dbg
cd $(DESTDIR)$(tooldir)/lib && ln -sf libmsys-2.0.a libg.a

install-headers:
Expand Down Expand Up @@ -658,7 +658,7 @@ uninstall-man:
done

clean distclean realclean:
-rm -f *.o *.dll *.pdb *.a *.exp junk *.base version.cc *.exe *.d *stamp* *_magic.h sigfe.s msys.def globals.h
-rm -f *.o *.dll *.dbg *.a *.exp junk *.base version.cc *.exe *.d *stamp* *_magic.h sigfe.s msys.def globals.h
-@$(MAKE) -C ${cygserver_blddir} libclean

maintainer-clean: clean
Expand All @@ -672,17 +672,15 @@ $(LDSCRIPT): $(LDSCRIPT).in
$(CC) -E - -P < $^ -o $@

# Rule to build msys-2.0.dll
$(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile $(VERSION_OFILES)
$(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg $(DLL_OFILES) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile $(VERSION_OFILES)
$(CXX) $(CXXFLAGS) \
-mno-use-libstdc-wrappers -L${WINDOWS_LIBDIR} \
-Wl,--gc-sections $(nostdlib) -Wl,-T$(firstword $^) -static \
-Wl,--heap=0 -Wl,--out-implib,msysdll.a -shared -o $@ \
-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) $(VERSION_OFILES) \
$(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \
-lgcc $(DLL_IMPORTS) -Wl,-Map,msys.map
MINGW_PREFIX=/mingw32 && \
case "$$(uname -m)" in x86_64) MINGW_PREFIX=/mingw64;; esac && \
$$MINGW_PREFIX/bin/cv2pdb "$@" "$@" ${patsubst %0.dll,%-2.0.pdb,$@}
@$(word 2,$^) $(OBJDUMP) $(OBJCOPY) $@ ${patsubst %0.dll,%-2.0.dbg,$@}
@ln -f $@ new-$(DLL_NAME)

# Rule to build libmsys-2.0.a
Expand Down

0 comments on commit 7332baf

Please sign in to comment.