[llvm-commits] [llvm] r112954 - /llvm/trunk/Makefile.rules

[Mikhail Glushenkov]

Author: foldr
Date: Fri Sep  3 04:57:52 2010
New Revision: 112954

URL: http://llvm.org/viewvc/llvm-project?rev=112954&view=rev
Log:
Rules for win32 ld shouldn't fire when cross-compiling.

Modified:
    llvm/trunk/Makefile.rules

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=112954&r1=112953&r2=112954&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Fri Sep  3 04:57:52 2010
@@ -972,7 +972,14 @@
 endif
 
 # GNU ld Win32 accepts .DEF files that contain "DATA" entries.
+# This doesn't work when cross-compiling, though.
 ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+ifneq ($(LLVM_CROSS_COMPILING),1)
+HAVE_WIN32_GNU_LD=1
+endif
+endif
+
+ifeq ($(HAVE_WIN32_GNU_LD),1)
 NativeExportsFile := $(ObjDir)/$(notdir $(EXPORTED_SYMBOL_FILE:.exports=.def))
 
 # LLVMLibsOptions is invalidated at processing tools/llvm-shlib.