diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-14 02:06:01 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-05-14 02:06:12 +0300 |
| commit | c7d75e6dd0889c8a097f7bd6808bf69c3218968f (patch) | |
| tree | d434c0c1b4d95589636af671ceeaab3d03dbb107 /cppunit | |
| parent | 4acf86448e93427822fb59b1fddf80709bc149c1 (diff) | |
Mostly bypass when cross-compiling
Unfortunately it still untars the tarball. But at least nothing gets
built or delivered when cross-compiling.
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/makefile.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index a842e425e7be..df5256b4b8f3 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -40,6 +40,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912630&group_id=11795&atid=311795> +.IF "$(CROSS_COMPILING)=="" + .IF "$(OS)" == "WNT" .IF "$(COM)" == "MSC" @@ -93,10 +95,6 @@ OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ ooo-install/bin/cygcppunit-1-12-1.dll OUT2LIB = ooo-install/lib/libcppunit.dll.a -.INCLUDE: set_ext.mk -.INCLUDE: target.mk -.INCLUDE: tg_ext.mk - .ENDIF # "$(COM)" == "GCC" .ENDIF # "$(COM)" == "MSC" @@ -136,8 +134,9 @@ OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0 OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 .END +.END +.ENDIF + .INCLUDE: set_ext.mk .INCLUDE: target.mk .INCLUDE: tg_ext.mk - -.END |