[llvm-commits] [dragonegg] r101126 - /dragonegg/trunk/Makefile

[Duncan Sands]

Author: baldrick
Date: Tue Apr 13 04:11:20 2010
New Revision: 101126

URL: http://llvm.org/viewvc/llvm-project?rev=101126&view=rev
Log:
Don't list libraries in LD_OPTIONS.  List the libraries to use explicitly
when linking.

Modified:
    dragonegg/trunk/Makefile

Modified: dragonegg/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/Makefile?rev=101126&r1=101125&r2=101126&view=diff
==============================================================================
--- dragonegg/trunk/Makefile (original)
+++ dragonegg/trunk/Makefile Tue Apr 13 04:11:20 2010
@@ -50,8 +50,7 @@
 	     -DTARGET_NAME=\"$(TARGET_TRIPLE)\" \
 	     -I$(SRC_DIR) -I$(GCC_PLUGIN_DIR)/include
 
-LD_OPTIONS+=$(LDFLAGS) $(shell $(LLVM_CONFIG) --ldflags) \
-	    $(shell $(LLVM_CONFIG) --libs analysis core ipo scalaropts target)
+LD_OPTIONS+=$(LDFLAGS) $(shell $(LLVM_CONFIG) --ldflags)
 
 # NOTE: The following flags can only be used after TARGET_UTIL has been built.
 TARGET_HEADERS+=-I$(SRC_DIR)/$(shell $(TARGET_UTIL) -p) \
@@ -66,7 +65,8 @@
 
 $(TARGET_UTIL): $(TARGET_UTIL_OBJECTS)
 	@echo Linking $@
-	$(QUIET)$(CXX) -o $@ $^ $(LD_OPTIONS)
+	$(QUIET)$(CXX) -o $@ $^ $(LD_OPTIONS) \
+	$(shell $(LLVM_CONFIG) --libs support)
 
 %.o : $(SRC_DIR)/%.c $(TARGET_UTIL)
 	@echo Compiling $*.c
@@ -83,10 +83,10 @@
 
 $(PLUGIN): $(PLUGIN_OBJECTS) $(TARGET_OBJECT) $(TARGET_UTIL)
 	@echo Linking $@
-	$(QUIET)$(CXX) $(LOADABLE_MODULE_OPTIONS) $(CXXFLAGS) \
-	-o $@ $(PLUGIN_OBJECTS) $(TARGET_OBJECT) $(LD_OPTIONS) \
-	$(shell $(LLVM_CONFIG) --libs $(shell $(TARGET_UTIL) -p))
-
+	$(QUIET)$(CXX) -o $@ $(LOADABLE_MODULE_OPTIONS) $(CXXFLAGS) \
+	$(LD_OPTIONS) $(PLUGIN_OBJECTS) $(TARGET_OBJECT) \
+	$(shell $(LLVM_CONFIG) --libs analysis core ipo scalaropts target \
+	$(shell $(TARGET_UTIL) -p))
 
 clean::
 	$(QUIET)rm -f *.o *.d $(PLUGIN) $(TARGET_UTIL)