diff options
| author | Rene Engelhard <rene@debian.org> | 2012-09-27 19:51:33 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-09-27 22:45:03 +0200 |
| commit | c0fb5ed758c9ed8c1bb6b8344592c4781f475443 (patch) | |
| tree | 92537d1c439601a5360115c2a31b86f9c289eb3e /idlc | |
| parent | 4e6907b5d526241c93767fd25d8c2866c034a8d8 (diff) | |
add --with-system-ucpp
Change-Id: Ic322d1be23033049fa3b5cd60c00479bb6cae3ca
Diffstat (limited to 'idlc')
| -rw-r--r-- | idlc/Executable_idlc.mk | 7 | ||||
| -rw-r--r-- | idlc/prj/build.lst | 2 | ||||
| -rw-r--r-- | idlc/source/idlccompile.cxx | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk index 32ecda6777ab..ef2df8956161 100644 --- a/idlc/Executable_idlc.mk +++ b/idlc/Executable_idlc.mk @@ -46,6 +46,13 @@ $(eval $(call gb_Executable_add_scanners,idlc,\ idlc/source/scanner \ )) +ifneq (,$(SYSTEM_UCPP)) +$(eval $(call gb_Executable_add_defs,idlc,\ + -DSYSTEM_UCPP \ + -DUCPP=\"file:$(SYSTEM_UCPP)\" \ +)) +endif + $(eval $(call gb_Executable_add_exception_objects,idlc,\ idlc/source/idlcmain \ idlc/source/idlc \ diff --git a/idlc/prj/build.lst b/idlc/prj/build.lst index 5113694b67dc..e2c515a8e6e7 100644 --- a/idlc/prj/build.lst +++ b/idlc/prj/build.lst @@ -1,3 +1,3 @@ -ic idlc : ucpp registry NULL +ic idlc : UCPP:ucpp registry NULL ic idlc usr1 - all ic_mkout NULL ic idlc\prj nmake - all ic_prj NULL diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 0491046560a7..1acbf8440ede 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -299,6 +299,7 @@ sal_Int32 compileFile(const OString * pathname) OUString cpp; OUString startDir; +#ifndef SYSTEM_UCPP if (osl_getExecutableFile(&cpp.pData) != osl_Process_E_None) { OSL_ASSERT(false); } @@ -311,7 +312,9 @@ sal_Int32 compileFile(const OString * pathname) #else cpp += OUString( RTL_CONSTASCII_USTRINGPARAM("ucpp")); #endif - +#else // SYSTEM_UCPP + cpp = OUString( RTL_CONSTASCII_USTRINGPARAM(UCPP)); +#endif oslProcess hProcess = NULL; oslProcessError procError = osl_Process_E_None; |