diff options
| author | wtc%netscape.com <devnull@localhost> | 2003-09-16 02:01:24 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2003-09-16 02:01:24 +0000 |
| commit | ac763e319c9c55b1b1eb89d746e57a6e21d227d7 (patch) | |
| tree | 2a27e20f50d251e679e794d1ff4c242f3d84d466 /pr/tests | |
| parent | 35fd11ed50d9b9478048adbb23ac4e8a127aea01 (diff) | |
| download | nspr-hg-ac763e319c9c55b1b1eb89d746e57a6e21d227d7.tar.gz | |
Bugzilla bug 215581: build with GCC 3.2.2 for OS/2. The patch is
contributed by Javier Pedemonte <pedemont@us.ibm.com>. r=wtc.
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
Diffstat (limited to 'pr/tests')
| -rw-r--r-- | pr/tests/Makefile.in | 2 | ||||
| -rw-r--r-- | pr/tests/dll/Makefile.in | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index d765b256..62e7e18c 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -235,7 +235,7 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO else EXTRA_LIBS = $(OS_LIBS) - LDOPTS = -Zmtd -Zomf -Zlinker /PM:VIO -Zlinker /ST:0x30000 + LDOPTS = -Zomf -Zlinker /PM:VIO -Zlinker /ST:0x64000 endif endif diff --git a/pr/tests/dll/Makefile.in b/pr/tests/dll/Makefile.in index 38ad5b8e..2d86a4ac 100644 --- a/pr/tests/dll/Makefile.in +++ b/pr/tests/dll/Makefile.in @@ -78,12 +78,11 @@ ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) IMPORT_LIBRARY = $(OBJDIR)/my.$(LIB_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/my.dll ifeq ($(OS_ARCH), OS2) -LIBRARY = $(OBJDIR)/my_s.lib -# XXX $(LIBRARY) probably doesn't need to be added to TARGETS. -TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) -else -TARGETS = $(SHARED_LIBRARY) $(IMPORT_LIBRARY) +MAPFILE = $(OBJDIR)/my.def +GARBAGE += $(MAPFILE) +MKSHLIB += $(MAPFILE) endif +TARGETS = $(SHARED_LIBRARY) $(IMPORT_LIBRARY) else ifdef MKSHLIB SHARED_LIBRARY = $(OBJDIR)/libmy.$(DLL_SUFFIX) |