diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-06-20 23:15:41 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-06-20 23:15:41 +0000 |
| commit | fa4efe8e185f853b396be995a5d8d97c8d245e03 (patch) | |
| tree | 84603418e0a1675817d59a9aa49478da88e219a0 /win32 | |
| parent | eda5ff319dcb749e45b560057fa141edfd70ae33 (diff) | |
| download | perl-fa4efe8e185f853b396be995a5d8d97c8d245e03.tar.gz | |
tweaks to allow both mingw32{gcc-2.8.1,egcs-1.0.2} build and test
p4raw-id: //depot/perl@1163
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 7 | ||||
| -rw-r--r-- | win32/makefile.mk | 15 |
2 files changed, 16 insertions, 6 deletions
diff --git a/win32/Makefile b/win32/Makefile index d315882ddf..60eda26d43 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -67,6 +67,11 @@ CCINCDIR = $(CCHOME)\include CCLIBDIR = $(CCHOME)\lib # +# specify space-separated list of extra directories to look for libraries +# +EXTRALIBDIRS = + +# # set this to your email address (perl will guess a value from # from your loginname and your hostname, which may not be right) #EMAIL = @@ -468,7 +473,7 @@ CFG_VARS = \ "libs=$(LIBFILES)" \ "incpath=$(CCINCDIR)" \ "libperl=$(PERLIMPLIB)" \ - "libpth=$(CCLIBDIR)" \ + "libpth=$(CCLIBDIR) $(EXTRALIBDIRS)" \ "libc=$(LIBC)" \ "make=nmake" \ "static_ext=$(STATIC_EXT)" \ diff --git a/win32/makefile.mk b/win32/makefile.mk index d41d588b70..68f2180433 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -74,6 +74,11 @@ CCINCDIR *= $(CCHOME)\include CCLIBDIR *= $(CCHOME)\lib # +# specify space-separated list of extra directories to look for libraries +# +EXTRALIBDIRS *= + +# # set this to point to cmd.exe (only needed if you use some # alternate shell that doesn't grok cmd.exe style commands) #SHELL *= g:\winnt\system32\cmd.exe @@ -155,15 +160,15 @@ LINK_DBG = CFLAGS = -w -d -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \ $(PCHFLAGS) $(OPTIMIZE) -LINK_FLAGS = $(LINK_DBG) -L$(CCLIBDIR) +LINK_FLAGS = $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L") OBJOUT_FLAG = -o EXEOUT_FLAG = -e LIBOUT_FLAG = .ELIF "$(CCTYPE)" == "GCC" -CC = gcc -LINK32 = gcc +CC = gcc -pipe +LINK32 = gcc -pipe LIB32 = ar rc IMPLIB = dlltool @@ -193,7 +198,7 @@ LINK_DBG = .ENDIF CFLAGS = $(INCLUDES) $(DEFINES) $(LOCDEFS) $(OPTIMIZE) -LINK_FLAGS = $(LINK_DBG) -L$(CCLIBDIR) +LINK_FLAGS = $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L") OBJOUT_FLAG = -o EXEOUT_FLAG = -o LIBOUT_FLAG = @@ -578,7 +583,7 @@ CFG_VARS = \ "libs=$(LIBFILES:f)" \ "incpath=$(CCINCDIR)" \ "libperl=$(PERLIMPLIB:f)" \ - "libpth=$(strip $(CCLIBDIR) $(LIBFILES:d))" \ + "libpth=$(strip $(CCLIBDIR) $(EXTRALIBDIRS) $(LIBFILES:d))" \ "libc=$(LIBC)" \ "make=dmake" \ "_o=$(o)" "obj_ext=$(o)" \ |