diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-29 19:30:27 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-29 19:30:27 +0000 |
| commit | ec8e9893969874f3175dba5a7eb6b98b4d9abbd1 (patch) | |
| tree | 8c222a1ecbd79cee272a918f7cac27dfb793e443 | |
| parent | 75e9b66ff61ad82c100cb55554ca801738e45bf9 (diff) | |
| download | ATCD-ec8e9893969874f3175dba5a7eb6b98b4d9abbd1.tar.gz | |
ChangeLogTag: Tue Aug 29 14:27:37 2000 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_chorus4.x_g++.GNU | 15 |
4 files changed, 26 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 09dca07cc8e..bf3894ad2b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Aug 29 14:27:37 2000 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_chorus4.x_g++.GNU + Made an additional modification to use the $(MERGEDIR)/Paths + include file if MERGEDIR is defined. + Tue Aug 29 12:23:41 2000 Steve Huston <shuston@riverace.com> * ace/TP_Reactor.(h cpp): Added a new dispatch_i_protected method. diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 09dca07cc8e..bf3894ad2b4 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue Aug 29 14:27:37 2000 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_chorus4.x_g++.GNU + Made an additional modification to use the $(MERGEDIR)/Paths + include file if MERGEDIR is defined. + Tue Aug 29 12:23:41 2000 Steve Huston <shuston@riverace.com> * ace/TP_Reactor.(h cpp): Added a new dispatch_i_protected method. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 09dca07cc8e..bf3894ad2b4 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Tue Aug 29 14:27:37 2000 Chad Elliott <elliott_c@ociweb.com> + + * include/makeinclude/platform_chorus4.x_g++.GNU + Made an additional modification to use the $(MERGEDIR)/Paths + include file if MERGEDIR is defined. + Tue Aug 29 12:23:41 2000 Steve Huston <shuston@riverace.com> * ace/TP_Reactor.(h cpp): Added a new dispatch_i_protected method. diff --git a/include/makeinclude/platform_chorus4.x_g++.GNU b/include/makeinclude/platform_chorus4.x_g++.GNU index 10a5102180e..71a9ed9b117 100644 --- a/include/makeinclude/platform_chorus4.x_g++.GNU +++ b/include/makeinclude/platform_chorus4.x_g++.GNU @@ -9,18 +9,16 @@ # You will probably need to set the following environment variables # or macros: # +# Define your CPU: # CPU powerpc (default), sparc or ... +# +# Define these: # CHTOOLS_DIR <chorus install path>/4.0/chorus-$CPU/tools # NUCLEUS_DIR <chorus install path>/4.0/chorus-$CPU/kernel # +# or # -# Example: -# The Paths file that is set up when a kernel is configured and built -# contains definitions for the CHTOOLS_DIR and NUCLEUS_DIR. -# -# -- platform_macros.GNU -- -# include $(MERGEDIR)/Paths -# include $(ACE_ROOT)/include/makeinclude/platform_chorus4.x_g++.GNU +# Define MERGEDIR to your kernel build location. # CHORUS = 1 @@ -35,6 +33,9 @@ static_libs = 1 # # Directory where the Chorus Development System is installed # +ifdef MERGEDIR + include $(MERGEDIR)/Paths +endif ifndef CHTOOLS_DIR CONFIGURATION_ERROR_CHTOOLS: CHTOOLS_DIR_must_be_set! endif |