diff options
author | Peter Williams <peterw@mono-cvs.ximian.com> | 2003-07-20 23:12:32 +0400 |
---|---|---|
committer | Peter Williams <peterw@mono-cvs.ximian.com> | 2003-07-20 23:12:32 +0400 |
commit | ce1416a11a989c8a80d0bfa1caa165a8d38c4c45 (patch) | |
tree | 1afaf6f5c69a1dbc1efc226d66b9c4c50f8faa0d /mcs/build | |
parent | 0b607733bdb3edfe1a6d52445a60355e92037b60 (diff) |
2003-07-20 Peter Williams <peter@newton.cx>
* library.make ($(response)): Do a "Creating ..." line here.
* executable.make ($(response)): Same.
* config-default.make: Make warning more forceful.
* rules.make: Define a useful 'PLATFORM_MONO_NATIVE' that is
set if the platform does not have a native runtime (ie, linux).
Also reorder some definitions.
2003-07-20 Peter Williams <peter@newton.cx>
* Created. See ../ChangeLog for entries earlier than
this.
svn path=/trunk/mcs/; revision=16453
Diffstat (limited to 'mcs/build')
-rw-r--r-- | mcs/build/ChangeLog | 17 | ||||
-rw-r--r-- | mcs/build/config-default.make | 6 | ||||
-rw-r--r-- | mcs/build/executable.make | 3 | ||||
-rw-r--r-- | mcs/build/library.make | 3 | ||||
-rw-r--r-- | mcs/build/profiles/default.make | 2 | ||||
-rw-r--r-- | mcs/build/rules.make | 15 |
6 files changed, 37 insertions, 9 deletions
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog new file mode 100644 index 00000000000..ae2b863b014 --- /dev/null +++ b/mcs/build/ChangeLog @@ -0,0 +1,17 @@ +2003-07-20 Peter Williams <peter@newton.cx> + + * library.make ($(response)): Do a "Creating ..." line here. + + * executable.make ($(response)): Same. + + * config-default.make: Make warning more forceful. + + * rules.make: Define a useful 'PLATFORM_MONO_NATIVE' that is + set if the platform does not have a native runtime (ie, linux). + Also reorder some definitions. + +2003-07-20 Peter Williams <peter@newton.cx> + + * Created. See ../ChangeLog for entries earlier than + this. + diff --git a/mcs/build/config-default.make b/mcs/build/config-default.make index 682f13d1279..960102835c0 100644 --- a/mcs/build/config-default.make +++ b/mcs/build/config-default.make @@ -2,9 +2,9 @@ # # This makefile fragment has (default) configuration # settings for building MCS. -# -# Instead of editing this file, create config.make -# and override settings there. + +# DO NOT EDIT THIS FILE! Create config.make and override settings +# there. RUNTIME_FLAGS = TEST_HARNESS = $(topdir)/nunit20/nunit-console/nunit-console.exe diff --git a/mcs/build/executable.make b/mcs/build/executable.make index 2b781bac691..4ccc8d3cf7c 100644 --- a/mcs/build/executable.make +++ b/mcs/build/executable.make @@ -59,7 +59,8 @@ $(makefrag): $(sourcefile) ifdef PLATFORM_CHANGE_SEPARATOR_CMD $(response): $(sourcefile) - cat $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@ + @echo Creating $@ ... + @cat $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@ endif -include $(makefrag) diff --git a/mcs/build/library.make b/mcs/build/library.make index db0c6825ee3..c1fd6436c5c 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -87,7 +87,8 @@ $(makefrag): $(sourcefile) ifdef PLATFORM_CHANGE_SEPARATOR_CMD $(response): $(sourcefile) - cat $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@ + @echo Creating $@ ... + @cat $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@ endif -include $(makefrag) diff --git a/mcs/build/profiles/default.make b/mcs/build/profiles/default.make index ee82624725b..b17090cb8bd 100644 --- a/mcs/build/profiles/default.make +++ b/mcs/build/profiles/default.make @@ -14,7 +14,7 @@ # run the compiler; /r: flags are by default loaded from whatever's # in the MONO_PATH too). -ifeq ($(PLATFORM_RUNTIME),$(RUNTIME)) +ifdef PLATFORM_MONO_NATIVE MCS = MONO_PATH="$(topdir)/class/lib:$$MONO_PATH" $(INTERNAL_MCS) else MCS = $(PLATFORM_RUNTIME) $(BOOTSTRAP_MCS) /lib:$(topdir)/class/lib diff --git a/mcs/build/rules.make b/mcs/build/rules.make index deeb57c2a88..c597cfc18d9 100644 --- a/mcs/build/rules.make +++ b/mcs/build/rules.make @@ -64,13 +64,22 @@ PLATFORM = linux endif endif -ifndef PROFILE -PROFILE = default +# Platform config + +include $(topdir)/build/platforms/$(PLATFORM).make + +# Useful + +ifeq ($(PLATFORM_RUNTIME),$(RUNTIME)) +PLATFORM_MONO_NATIVE = yes endif # Rest of the configuration -include $(topdir)/build/platforms/$(PLATFORM).make +ifndef PROFILE +PROFILE = default +endif + include $(topdir)/build/profiles/$(PROFILE).make -include $(topdir)/build/config.make |