[llvm-commits] [llvm-gcc-4.2] r43992 - /llvm-gcc-4.2/trunk/gcc/Makefile.in

[Bill Wendling]

Author: void
Date: Sat Nov 10 23:47:02 2007
New Revision: 43992

URL: http://llvm.org/viewvc/llvm-project?rev=43992&view=rev
Log:
A bunch of changes to get 4.2 to build the Apple Way

Modified:
    llvm-gcc-4.2/trunk/gcc/Makefile.in

Modified: llvm-gcc-4.2/trunk/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/Makefile.in?rev=43992&r1=43991&r2=43992&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/gcc/Makefile.in Sat Nov 10 23:47:02 2007
@@ -247,7 +247,17 @@
 
 # Use llvm-config to get the srcdir that LLVM was configured with, to support
 # srcdir != objdir builds.
-LLVMSRCDIR := $(shell $(LLVMBINPATH)/llvm-config --src-root)
+### FIXME: Relying upon llvm-config doesn't work if we built LLVM in one placed,
+### moved it to another place, and then built LLVM-GCC. If the directory doesn't
+### exist, then use LLVMOBJDIR.
+LLVMSRCDIR := $(shell \
+  P=`$(LLVMBINPATH)/llvm-config --src-root`; \
+  if [ `pwd` == $$P ]; then \
+    echo "$(LLVMOBJDIR)"; \
+  else \
+    echo "$$P"; \
+  fi);
+LLVMSRCDIR := $(shell echo "$(LLVMSRCDIR)" | sed -e 's,;,,')
 endif
 
 ifdef LLVM_VERSION_INFO
@@ -1198,7 +1208,7 @@
 libllvmgcc$(LLVM_STAGE).dylib: llvm-linker-hack.cpp $(LLVMLIBFILES)
 	echo $(LLVMLIBFILES)
 	$(CXX) $(DYLIB_COMPILE_FLAGS) $(INCLUDES) -o $@ \
-           $< $(LLVMLIBFILES)  -dynamiclib -single_module \
+           $< $(LLVMLIBFILES) -L/usr/lib/gcc/$(build)/4.0.1/ -dynamiclib -single_module \
            -install_name @executable_path/$@
 
 LLVMBACKENDFILES := libllvmgcc$(LLVM_STAGE).dylib
@@ -1515,7 +1525,7 @@
 cc1-exported-symbol-list.txt:
 	echo "_main" > $@
 LIBDEPS += cc1-exported-symbol-list.txt
-LINKCC += -dead_strip -exported_symbols_list cc1-exported-symbol-list.txt
+LINKCC += -dead_strip -exported_symbols_list cc1-exported-symbol-list.txt -L/usr/lib/gcc/$(build)/4.0.1/
 endif
 else
 LINKCC := $(CC)