diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-15 11:39:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 09:31:43 +0000 |
| commit | 5c5a6c3668c2112ce419f6b559105e915d9bd29d (patch) | |
| tree | cc62c238140a2a95ddda48abac74cbd8ee0b8b7b /codemaker | |
| parent | 0e0508b18f9daad618e19249daf008d518d5e860 (diff) | |
bootstrap building with --disable-dynloading on standard linux
Change-Id: I5baf70f0053612cba8b74f54aff11ce25cdeb95a
Reviewed-on: https://gerrit.libreoffice.org/32202
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/Executable_cppumaker.mk | 6 | ||||
| -rw-r--r-- | codemaker/Executable_javamaker.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk index 26347a07976a..e392339d3729 100644 --- a/codemaker/Executable_cppumaker.mk +++ b/codemaker/Executable_cppumaker.mk @@ -12,9 +12,11 @@ $(eval $(call gb_Executable_Executable,cppumaker)) $(eval $(call gb_Executable_use_external,cppumaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,cppumaker,\ - sal \ - salhelper \ unoidl \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \ + salhelper \ + sal \ )) $(eval $(call gb_Executable_use_static_libraries,cppumaker,\ diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk index aafb198b5b02..febfe9a71c29 100644 --- a/codemaker/Executable_javamaker.mk +++ b/codemaker/Executable_javamaker.mk @@ -12,9 +12,11 @@ $(eval $(call gb_Executable_Executable,javamaker)) $(eval $(call gb_Executable_use_external,javamaker,boost_headers)) $(eval $(call gb_Executable_use_libraries,javamaker,\ - sal \ - salhelper \ unoidl \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \ + $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \ + salhelper \ + sal \ )) $(eval $(call gb_Executable_use_static_libraries,javamaker,\ |