Skip to content

Commit

Permalink
* library.make (BUILT_SOURCES_cmdline): Use
Browse files Browse the repository at this point in the history
PLATFORM_CHANGE_SEPARATOR_CMD on BUILT_SOURCES too.
($(the_lib)): Use it.

svn path=/trunk/mcs/; revision=37293
  • Loading branch information
harinath committed Dec 7, 2004
1 parent c2b4a4a commit 3a17c92
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
6 changes: 6 additions & 0 deletions mcs/build/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2004-12-07 Raja R Harinath <rharinath@novell.com>

* library.make (BUILT_SOURCES_cmdline): Use
PLATFORM_CHANGE_SEPARATOR_CMD on BUILT_SOURCES too.
($(the_lib)): Use it.

2004-12-04 Atsushi Enomoto <atsushi@ximian.com>

* library.make,
Expand Down
10 changes: 8 additions & 2 deletions mcs/build/library.make
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,22 @@ $(sn):
cd $(topdir) && $(MAKE) PROFILE=net_1_1_bootstrap
endif

ifeq (cat, $(PLATFORM_CHANGE_SEPARATOR_CMD))
BUILT_SOURCES_cmdline = $(BUILT_SOURCES)
else
BUILT_SOURCES_cmdline = `echo $(BUILT_SOURCES) | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
endif

# The library

$(the_lib): $(response) $(sn) $(BUILT_SOURCES)
ifdef LIBRARY_USE_INTERMEDIATE_FILE
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$(@F) $(BUILT_SOURCES) @$(response)
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$(@F) $(BUILT_SOURCES_cmdline) @$(response)
$(SN) $(SNFLAGS) $(@F) $(LIBRARY_SNK)
mv $(@F) $@
test ! -f $(@F).mdb || mv $(@F).mdb $@.mdb
else
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ $(BUILT_SOURCES) @$(response)
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ $(BUILT_SOURCES_cmdline) @$(response)
$(SN) $(SNFLAGS) $@ $(LIBRARY_SNK)
endif

Expand Down

0 comments on commit 3a17c92

Please sign in to comment.