From 4bedfe4bbad029e7f7f068ebf62ec988197c440f Mon Sep 17 00:00:00 2001
From: henry <henry>
Date: Mon, 29 Mar 2010 09:48:29 +0100
Subject: [PATCH] Removed absolute path to 'cpp'.

Avoids problems with incompatibilities between system and gcc libraries.  Now
'cpp' must be in one of the directories in 'PATH'.
---
 wmake/rules/SiCortex64Gcc/general           |  2 +-
 wmake/rules/SunOS64Gcc/general              |  2 +-
 wmake/rules/linux64Gcc/general              |  2 +-
 wmake/rules/linux64Gcc42/general            |  2 +-
 wmake/rules/linux64Gcc43/general            |  2 +-
 wmake/rules/linuxGcc/general                |  2 +-
 wmake/rules/linuxGcc42/general              |  2 +-
 wmake/rules/linuxGcc43/general              |  2 +-
 wmake/rules/linuxIA64Gcc/general            |  2 +-
 wmake/rules/linuxPPC64Gcc/general           |  2 +-
 wmake/rules/linuxmingw32/X                  |  3 ---
 wmake/rules/linuxmingw32/c                  | 16 ----------------
 wmake/rules/linuxmingw32/c++                | 23 -----------------------
 wmake/rules/linuxmingw32/c++Debug           |  2 --
 wmake/rules/linuxmingw32/c++Opt             |  2 --
 wmake/rules/linuxmingw32/c++Prof            |  2 --
 wmake/rules/linuxmingw32/cDebug             |  2 --
 wmake/rules/linuxmingw32/cOpt               |  2 --
 wmake/rules/linuxmingw32/cProf              |  2 --
 wmake/rules/linuxmingw32/general            | 24 ------------------------
 wmake/rules/linuxmingw32/mplib              |  3 ---
 wmake/rules/linuxmingw32/mplibGAMMA         |  3 ---
 wmake/rules/linuxmingw32/mplibMPICH         |  3 ---
 wmake/rules/linuxmingw32/mplibMPICH-GM      |  3 ---
 wmake/rules/linuxmingw32/mplibOPENMPI       |  3 ---
 wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI |  1 -
 wmake/rules/solarisGcc/general              |  2 +-
 27 files changed, 11 insertions(+), 105 deletions(-)
 delete mode 100644 wmake/rules/linuxmingw32/X
 delete mode 100644 wmake/rules/linuxmingw32/c
 delete mode 100644 wmake/rules/linuxmingw32/c++
 delete mode 100644 wmake/rules/linuxmingw32/c++Debug
 delete mode 100644 wmake/rules/linuxmingw32/c++Opt
 delete mode 100644 wmake/rules/linuxmingw32/c++Prof
 delete mode 100644 wmake/rules/linuxmingw32/cDebug
 delete mode 100644 wmake/rules/linuxmingw32/cOpt
 delete mode 100644 wmake/rules/linuxmingw32/cProf
 delete mode 100644 wmake/rules/linuxmingw32/general
 delete mode 100644 wmake/rules/linuxmingw32/mplib
 delete mode 100644 wmake/rules/linuxmingw32/mplibGAMMA
 delete mode 100644 wmake/rules/linuxmingw32/mplibMPICH
 delete mode 100644 wmake/rules/linuxmingw32/mplibMPICH-GM
 delete mode 100644 wmake/rules/linuxmingw32/mplibOPENMPI
 delete mode 120000 wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI

diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general
index d70a77cd..db93f118 100644
--- a/wmake/rules/SiCortex64Gcc/general
+++ b/wmake/rules/SiCortex64Gcc/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld -A64
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general
index f9b56321..229da88b 100644
--- a/wmake/rules/SunOS64Gcc/general
+++ b/wmake/rules/SunOS64Gcc/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld -64
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general
index 10237bd1..2710037b 100644
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linux64Gcc42/general b/wmake/rules/linux64Gcc42/general
index d70a77cd..db93f118 100644
--- a/wmake/rules/linux64Gcc42/general
+++ b/wmake/rules/linux64Gcc42/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld -A64
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general
index 10237bd1..2710037b 100644
--- a/wmake/rules/linux64Gcc43/general
+++ b/wmake/rules/linux64Gcc43/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general
index 02ad6973..dee97aeb 100644
--- a/wmake/rules/linuxGcc/general
+++ b/wmake/rules/linuxGcc/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld -melf_i386
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxGcc42/general b/wmake/rules/linuxGcc42/general
index c300368e..f245d747 100644
--- a/wmake/rules/linuxGcc42/general
+++ b/wmake/rules/linuxGcc42/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld -melf_i386
 
 PROJECT_LIBS = -l$(WM_PROJECT) -ldl
diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general
index 02ad6973..dee97aeb 100644
--- a/wmake/rules/linuxGcc43/general
+++ b/wmake/rules/linuxGcc43/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld -melf_i386
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general
index 10237bd1..2710037b 100644
--- a/wmake/rules/linuxIA64Gcc/general
+++ b/wmake/rules/linuxIA64Gcc/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general
index 76d50763..9b231fba 100644
--- a/wmake/rules/linuxPPC64Gcc/general
+++ b/wmake/rules/linuxPPC64Gcc/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = cpp $(GFLAGS)
 LD         = ld -m elf64ppc
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxmingw32/X b/wmake/rules/linuxmingw32/X
deleted file mode 100644
index d4f8a960..00000000
--- a/wmake/rules/linuxmingw32/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = 
-XLIBS      =
diff --git a/wmake/rules/linuxmingw32/c b/wmake/rules/linuxmingw32/c
deleted file mode 100644
index c74ee742..00000000
--- a/wmake/rules/linuxmingw32/c
+++ /dev/null
@@ -1,16 +0,0 @@
-.SUFFIXES: .c .h
-
-cWARN        = -Wall
-
-cc          = mingw32-gcc -m32
-
-include $(RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS)
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -Wl,--output-def,$(LIB).def,--out-implib,$(LIB).a,--enable-auto-import -shared
-LINKEXE     = $(cc) -Wl,--enable-auto-import,--force-exe-suffix
diff --git a/wmake/rules/linuxmingw32/c++ b/wmake/rules/linuxmingw32/c++
deleted file mode 100644
index 0d1b9a38..00000000
--- a/wmake/rules/linuxmingw32/c++
+++ /dev/null
@@ -1,23 +0,0 @@
-.SUFFIXES: .C .cxx .cc .cpp
-
-c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter
-
-CC          = mingw32-g++
-
-include $(RULES)/c++$(WM_COMPILE_OPTION)
-
-ptFLAGS     = -DNoRepository -ftemplate-depth-40
-
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS)
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG)
-
-# Tried using -Wl,-no-undefined,--enable-runtime-pseudo-reloc
-# but didnt forgive undefined symbols during linking
-LINKLIBSO   = $(CC) $(c++FLAGS) -Wl,--output-def,$(LIB).def,--out-implib,$(LIB).a,--enable-auto-import -shared
-LINKEXE     = $(CC) $(c++FLAGS) -Wl,--enable-auto-import,--force-exe-suffix
diff --git a/wmake/rules/linuxmingw32/c++Debug b/wmake/rules/linuxmingw32/c++Debug
deleted file mode 100644
index 19bdb9c3..00000000
--- a/wmake/rules/linuxmingw32/c++Debug
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxmingw32/c++Opt b/wmake/rules/linuxmingw32/c++Opt
deleted file mode 100644
index 8d5bc55c..00000000
--- a/wmake/rules/linuxmingw32/c++Opt
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG     = 
-c++OPT      = -O3 -DNDEBUG
diff --git a/wmake/rules/linuxmingw32/c++Prof b/wmake/rules/linuxmingw32/c++Prof
deleted file mode 100644
index 3bda4dad..00000000
--- a/wmake/rules/linuxmingw32/c++Prof
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
diff --git a/wmake/rules/linuxmingw32/cDebug b/wmake/rules/linuxmingw32/cDebug
deleted file mode 100644
index 6c71ed93..00000000
--- a/wmake/rules/linuxmingw32/cDebug
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -finline-functions
diff --git a/wmake/rules/linuxmingw32/cOpt b/wmake/rules/linuxmingw32/cOpt
deleted file mode 100644
index f2abb559..00000000
--- a/wmake/rules/linuxmingw32/cOpt
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = 
-cOPT        = -O3 -DNDEBUG
diff --git a/wmake/rules/linuxmingw32/cProf b/wmake/rules/linuxmingw32/cProf
deleted file mode 100644
index ca3ac9bf..00000000
--- a/wmake/rules/linuxmingw32/cProf
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general
deleted file mode 100644
index 6a37beab..00000000
--- a/wmake/rules/linuxmingw32/general
+++ /dev/null
@@ -1,24 +0,0 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = mingw32-ld
-
-PROJECT_LIBS = -l$(WM_PROJECT)
-
-include $(RULES)/X
-
-include $(GENERAL_RULES)/sourceToDep
-
-include $(GENERAL_RULES)/flex
-include $(GENERAL_RULES)/flex++
-include $(GENERAL_RULES)/byacc
-include $(GENERAL_RULES)/btyacc++
-include $(GENERAL_RULES)/moc
-
-include $(RULES)/c
-include $(RULES)/c++
-
-SO      = dll
-EXE_EXT = .exe
-
-# Ensure we know what OS we are compiling for
-# during MakefileFiles and MakefileOptions
-GFLAGS  += -DWIN32 -DLITTLE_ENDIAN
diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib
deleted file mode 100644
index 8a84b401..00000000
--- a/wmake/rules/linuxmingw32/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA
deleted file mode 100644
index d62c6250..00000000
--- a/wmake/rules/linuxmingw32/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH
deleted file mode 100644
index ac17f7c1..00000000
--- a/wmake/rules/linuxmingw32/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM
deleted file mode 100644
index 88493ebc..00000000
--- a/wmake/rules/linuxmingw32/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI
deleted file mode 100644
index 834d2d3e..00000000
--- a/wmake/rules/linuxmingw32/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI b/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
deleted file mode 120000
index faf23244..00000000
--- a/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../linux64Gcc/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general
index 712af785..49660cb8 100644
--- a/wmake/rules/solarisGcc/general
+++ b/wmake/rules/solarisGcc/general
@@ -1,4 +1,4 @@
-CPP        = /usr/lib/cpp -undef $(GFLAGS)
+CPP        = cpp -undef $(GFLAGS)
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
 
-- 
2.11.4.GIT