From 20a5813a5f611ee32249615d26ccf607f6cf4252 Mon Sep 17 00:00:00 2001 From: Filipe Cabecinhas Date: Tue, 29 May 2012 13:35:46 +0000 Subject: [PATCH] Substitute LLVMLibsOptions for LD.Flags so we can find the mentioned libs llvm-svn: 157616 --- lldb/tools/driver/Makefile | 10 +++++----- lldb/tools/lldb-platform/Makefile | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lldb/tools/driver/Makefile b/lldb/tools/driver/Makefile index 2a8834d..88b1f1a 100644 --- a/lldb/tools/driver/Makefile +++ b/lldb/tools/driver/Makefile @@ -10,21 +10,21 @@ LLDB_LEVEL := ../.. TOOLNAME = lldb -LD.Flags += -ledit -llldb -llldbUtility +LLVMLibsOptions += -ledit -llldb -llldbUtility include $(LLDB_LEVEL)/Makefile ifeq ($(HOST_OS),Darwin) - LD.Flags += -Wl,-rpath,@loader_path/../lib/ - LD.Flags += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,"$(PROJ_SRC_DIR)/lldb-Info.plist" + LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/ + LLVMLibsOptions += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,"$(PROJ_SRC_DIR)/lldb-Info.plist" endif ifeq ($(HOST_OS),Linux) - LD.Flags += -Wl,-rpath,$(LibDir) + LLVMLibsOptions += -Wl,-rpath,$(LibDir) endif ifeq ($(HOST_OS),FreeBSD) CPP.Flags += -I/usr/include/edit #-v - LD.Flags += -Wl,-rpath,$(LibDir) + LLVMLibsOptions += -Wl,-rpath,$(LibDir) endif diff --git a/lldb/tools/lldb-platform/Makefile b/lldb/tools/lldb-platform/Makefile index 2bb5ea3..514ffac 100644 --- a/lldb/tools/lldb-platform/Makefile +++ b/lldb/tools/lldb-platform/Makefile @@ -10,14 +10,14 @@ LLDB_LEVEL := ../.. TOOLNAME = lldb-platform -LD.Flags += -llldb -llldbUtility +LLVMLibsOptions += -llldb -llldbUtility include $(LLDB_LEVEL)/Makefile ifeq ($(HOST_OS),Darwin) - LD.Flags += -Wl,-rpath,@loader_path/../lib/ + LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/ endif ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD)) - LD.Flags += -Wl,-rpath,$(LibDir) + LLVMLibsOptions += -Wl,-rpath,$(LibDir) endif -- 2.7.4