diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2002-05-29 12:35:39 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2002-05-29 12:35:39 +0000 |
| commit | e4e690f9462c026e1c3afd4cd85fd7787f8a003f (patch) | |
| tree | cc74c30fcb3856e492655f26cfaed2fc43f1c42a /lib/make | |
| parent | 3a220821207be5326d82ad75e5da422fc2962c43 (diff) | |
Set CPP to '$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl'.
This was neccessary in order to make fortran code compile again for thorns
which inherit a lot of variables.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2863 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
| -rw-r--r-- | lib/make/known-architectures/irix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/make/known-architectures/irix b/lib/make/known-architectures/irix index 255f1c59..0d24eb3c 100644 --- a/lib/make/known-architectures/irix +++ b/lib/make/known-architectures/irix @@ -6,7 +6,7 @@ # @desc # Known architectures file for SGI Irix systems # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/irix,v 1.32 2002-05-28 21:18:07 tradke Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/irix,v 1.33 2002-05-29 12:35:39 tradke Exp $ # @@*/ if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then @@ -24,19 +24,25 @@ if test "$CCTK_CONFIG_STAGE" = 'preferred-compilers' ; then fi # use the native SGI compilers by default + if test -z "$CPP"; then + CPP='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl' + echo Setting CPP compiler to $CPP + fi + + # use the native SGI compilers by default if test -z "$CC"; then - echo Setting C compiler to cc CC='cc' + echo Setting C compiler to $CC fi if test -z "$CXX"; then - echo Setting C++ compiler to CC CXX='CC' + echo Setting C++ compiler to $CXX fi if test -z "$LD"; then - echo Setting linker to CC LD='CC' + echo Setting linker to $LD fi @@ -120,8 +126,6 @@ else : ${F77_DEBUG_FLAGS='-g3'} : ${F90_WARN_FLAGS='-fullwarn'} : ${F77_WARN_FLAGS='-fullwarn'} - : ${F_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'} - : ${F77_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'} # Cache stuff if test -z "$L2_CACHELINE_BYTES" ; then |