diff options
| -rw-r--r-- | lldb/lib/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile index b7f002f4671..78d934b1dcd 100644 --- a/lldb/lib/Makefile +++ b/lldb/lib/Makefile @@ -12,14 +12,14 @@ LLDB_LEVEL := .. LIBRARYNAME = lldb -#EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/../resources/lldb-framework-exports +#EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/resources/lldb-framework-exports NO_BUILD_ARCHIVE = 1 LINK_LIBS_IN_SHARED = 1 SHARED_LIBRARY = 1 PYTHON_BUILD_FLAGS = $(shell python-config --ldflags) -# Include all archives in liblldb.a files +# Include all archives in liblldb.so file USEDLIBS = lldbAPI.a \ lldbBreakpoint.a \ lldbCommands.a \ @@ -33,6 +33,7 @@ USEDLIBS = lldbAPI.a \ lldbPluginABISysV_x86_64.a \ lldbPluginDisassemblerLLVM.a \ lldbPluginDynamicLoaderStatic.a \ + lldbPluginDynamicLoaderPOSIX.a \ lldbPluginEmulateInstructionARM.a \ lldbPluginLanguageRuntimeCPlusPlusItaniumABI.a \ lldbPluginLanguageRuntimeObjCAppleObjCRuntime.a \ @@ -87,13 +88,11 @@ endif ifeq ($(HOST_OS),Linux) USEDLIBS += lldbPluginProcessPOSIX.a \ lldbPluginProcessLinux.a \ - lldbPluginDynamicLoaderPOSIX.a \ lldbHostLinux.a endif ifeq ($(HOST_OS),FreeBSD) USEDLIBS += lldbHostFreeBSD.a \ - lldbPluginDynamicLoaderPOSIX.a \ lldbPluginProcessPOSIX.a \ lldbPluginProcessFreeBSD.a endif @@ -113,7 +112,9 @@ ifeq ($(HOST_OS),Darwin) LLVMLibsOptions += -framework Foundation -framework CoreFoundation LLVMLibsOptions += -framework CoreServices -framework Carbon -framework Security LLVMLibsOptions += -framework DebugSymbols $(PYTHON_BUILD_FLAGS) -lobjc - LLVMLibsOptions += -Wl,-exported_symbols_list -Wl,"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/resources/lldb-framework-exports" + ifneq ($(EXPORTED_SYMBOL_FILE),) + LLVMLibsOptions += -Wl,-exported_symbols_list -Wl,"$(EXPORTED_SYMBOL_FILE)" + endif # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') ifneq ($(DARWIN_VERS),8) @@ -129,7 +130,7 @@ ifeq ($(HOST_OS),Linux) # Don't allow unresolved symbols. LLVMLibsOptions += -Wl,--no-undefined # Link in python - LD.Flags += $(PYTHON_BUILD_FLAGS) -lrt + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt endif ifeq ($(HOST_OS),FreeBSD) @@ -139,5 +140,5 @@ ifeq ($(HOST_OS),FreeBSD) # Allow unresolved symbols. LLVMLibsOptions += -Wl,--allow-shlib-undefined # Link in python - LD.Flags += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo endif |
