maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix Windows stuff to follow the existing source organization. 

llvm-svn: 112976
This commit is contained in:
Dan Gohman 2010-09-03 17:29:33 +00:00
parent 4ae34afaf9
commit 02ab9a69b9
1 changed files with 17 additions and 15 deletions

32
llvm/Makefile.rules
View File

@ -961,23 +961,9 @@ $(NativeExportsFile): $(EXPORTED_SYMBOL_FILE) $(ObjDir)/.dir
clean-local:: clean-local::
-$(Verb) $(RM) -f $(NativeExportsFile) -$(Verb) $(RM) -f $(NativeExportsFile)
else else
NativeExportsFile := $(EXPORTED_SYMBOL_FILE)
endif
endif
# Now add the linker command-line options to use the native export file.
ifeq ($(HOST_OS),Darwin)
LLVMLibsOptions += -Wl,-exported_symbols_list,$(NativeExportsFile)
endif
# GNU ld Win32 accepts .DEF files that contain "DATA" entries.
ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
# GNU ld Win32 accepts .DEF files that contain "DATA" entries.
NativeExportsFile := $(ObjDir)/$(notdir $(EXPORTED_SYMBOL_FILE:.exports=.def)) NativeExportsFile := $(ObjDir)/$(notdir $(EXPORTED_SYMBOL_FILE:.exports=.def))
# LLVMLibsOptions is invalidated at processing tools/llvm-shlib.
SharedLinkOptions += $(NativeExportsFile)
$(NativeExportsFile): $(EXPORTED_SYMBOL_FILE) $(ObjDir)/.dir $(NativeExportsFile): $(EXPORTED_SYMBOL_FILE) $(ObjDir)/.dir
$(Echo) Generating $(notdir $@) $(Echo) Generating $(notdir $@)
$(Verb) $(ECHO) "EXPORTS" > $@ $(Verb) $(ECHO) "EXPORTS" > $@
@ -985,12 +971,28 @@ $(NativeExportsFile): $(EXPORTED_SYMBOL_FILE) $(ObjDir)/.dir
clean-local:: clean-local::
-$(Verb) $(RM) -f $(NativeExportsFile) -$(Verb) $(RM) -f $(NativeExportsFile)
else else
# Default behavior: just use the exports file verbatim.
NativeExportsFile := $(EXPORTED_SYMBOL_FILE)
endif
endif
endif
# Now add the linker command-line options to use the native export file.
# Darwin
ifeq ($(HOST_OS),Darwin)
LLVMLibsOptions += -Wl,-exported_symbols_list,$(NativeExportsFile)
endif
# gold, bfd ld, etc. # gold, bfd ld, etc.
ifeq ($(HAVE_LINK_VERSION_SCRIPT),1) ifeq ($(HAVE_LINK_VERSION_SCRIPT),1)
LLVMLibsOptions += -Wl,--version-script,$(NativeExportsFile) LLVMLibsOptions += -Wl,--version-script,$(NativeExportsFile)
endif endif
# Windows
ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
# LLVMLibsOptions is invalidated at processing tools/llvm-shlib.
SharedLinkOptions += $(NativeExportsFile)
endif endif
endif endif