summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-config/BuildVariables.inc.in
diff options
context:
space:
mode:
authorJF Bastien <jfb@google.com>2015-07-27 18:26:30 +0000
committerJF Bastien <jfb@google.com>2015-07-27 18:26:30 +0000
commitba70e9e1e63d88f09403e2643421d1baaed4de41 (patch)
treedd9fafe0461e134df1b0da01d93fb2baca299c6b /llvm/tools/llvm-config/BuildVariables.inc.in
parent83934d3915f20347d9b8d916be40506beb752459 (diff)
downloadbcm5719-llvm-ba70e9e1e63d88f09403e2643421d1baaed4de41.tar.gz
bcm5719-llvm-ba70e9e1e63d88f09403e2643421d1baaed4de41.zip
Fix `llvm-config` to emit the linker flag for the combined shared object built by autoconfig/make instead of the individual components.
Summary: When LLVM is configured to build shared libraries, CMake builds each component as it's own shared object, while autoconfig/make builds them statically and then links them all together to create a single shared object. This change adds compile time config flags to `llvm-config` so it can know whether LLVM's components are separated or not and act accordingly. This fixes `llvm-config` instead of fixing the makefiles to behave like CMake because, AIUI, LLVM's autoconfig/make build system is on the way out anyway. This change only affects `llvm-config` from builds that use autoconfig/make. Reviewers: jfb Subscribers: echristo, dschuff, llvm-commits Differential Revision: http://reviews.llvm.org/D11392 llvm-svn: 243297
Diffstat (limited to 'llvm/tools/llvm-config/BuildVariables.inc.in')
-rw-r--r--llvm/tools/llvm-config/BuildVariables.inc.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/tools/llvm-config/BuildVariables.inc.in b/llvm/tools/llvm-config/BuildVariables.inc.in
index 3f51f491a7a..66f7a16a4ce 100644
--- a/llvm/tools/llvm-config/BuildVariables.inc.in
+++ b/llvm/tools/llvm-config/BuildVariables.inc.in
@@ -26,3 +26,5 @@
#define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"
#define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
#define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"
+#define BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@"
+#define WAS_BUILT_WITH_CMAKE "@WAS_BUILT_WITH_CMAKE@"
OpenPOWER on IntegriCloud