diff options
| author | Sisyphus <sisyphus1@optusnet.com.au> | 2010-05-20 17:56:07 -0700 |
|---|---|---|
| committer | Jan Dubois <jand@activestate.com> | 2010-05-20 17:56:07 -0700 |
| commit | 23ae7f173577cbe2d62a4f7d64340f6457c75ee3 (patch) | |
| tree | 3742c701b12e4a0418f7e0cfabb3312fb3c73a52 /win32 | |
| parent | 36f77d7116441b32ff6c10307a116e105b7eabb4 (diff) | |
| download | perl-23ae7f173577cbe2d62a4f7d64340f6457c75ee3.tar.gz | |
Fix CCINCDIR and CCLIBDIR for mingw64 cross compiler
When building perl with the mingw64 x64 cross-compiler 'incpath', 'libpth',
'ldflags', 'lddlflags' and 'ldflags_nolargefiles' values in Config.pm and
Config_heavy.pl are not being set correctly because, with that compiler, the
include and lib directories are not immediately below $(CCHOME).
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 7d56063c51..c9686fb4f2 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -221,8 +221,6 @@ CCHOME *= C:\MinGW .ELSE CCHOME *= $(MSVCDIR) .ENDIF -CCINCDIR *= $(CCHOME)\include -CCLIBDIR *= $(CCHOME)\lib # # If building with gcc-4.x.x (or x86_64-w64-mingw32-gcc-4.x.x), then @@ -248,6 +246,18 @@ CCLIBDIR *= $(CCHOME)\lib #GCCCROSS *= define # +# Following sets $Config{incpath} and $Config{libpth} +# + +.IF "$(GCCCROSS)" == "define" +CCINCDIR *= $(CCHOME)\mingw\include +CCLIBDIR *= $(CCHOME)\mingw\lib +.ELSE +CCINCDIR *= $(CCHOME)\include +CCLIBDIR *= $(CCHOME)\lib +.ENDIF + +# # Additional compiler flags can be specified here. # BUILDOPT *= $(BUILDOPTEXTRA) |