diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-06 11:19:15 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-15 14:20:36 +0200 |
| commit | 9d6657398735f7ba81e72df371a1a4c428a3f1cf (patch) | |
| tree | 2e3c7c17dd26cde4f85bcc0ba6ac08c64cfc0622 /set_soenv.in | |
| parent | 15a1260bd715d04fe4a24f3d4db1b5cb1de6cb70 (diff) | |
Don't override CC and CXX on Windows when set, handle ccache.
This is to allow use of ccache by specifying something like:
export CC="ccache C:/path/to/cl.exe"
export CXX="ccache C:/patch/to/cl.exe"
before running ./autogen.sh
Diffstat (limited to 'set_soenv.in')
| -rwxr-xr-x | set_soenv.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/set_soenv.in b/set_soenv.in index 8e66789e1470..14f59b3494a1 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -125,12 +125,8 @@ $JDK = '@JDK@'; $JAVAFLAGS = '@JAVAFLAGS@'; $MINGW = '@WITH_MINGW@'; # use MinGW for Windows build $USE_MINGW = '@USE_MINGW@'; # use MinGW in cygwin or pure-mingw -if ( $MINGW eq "yes" ) -{ $CC = '@CC@'; # C compiler - $CXX = '@CXX@'; } # C++ compiler -else -{ $CC = PathFormat('@CC@'); # C compiler - $CXX = PathFormat('@CXX@'); } # C++ compiler +$CC = '@CC@'; # C compiler +$CXX = '@CXX@'; # C++ compiler $MOZILLA_VERSION = '@MOZILLA_VERSION@'; # mozilla version to use to build mozilla $MOZILLA_TOOLKIT = '@MOZILLA_TOOLKIT@'; # GUI toolkit to use to build mozilla $FLIPCMD = ""; # Flip '/' to '\' wrapper (only for winnt) |