ENH: simplify cpp rules to avoid absolute paths and multiple GFLAGS.

- otherwise /lib/cpp may need a different library binding than
  currently available and results in this type of error:

  /usr/lib64/gcc/x86_64-suse-linux/4.4/cc1:
  /data/app/OpenFOAM/ThirdParty-1.6.x/platforms/linux64/gcc-4.3.3/lib64/libstdc++.so.6:
  version `GLIBCXX_3.4.11' not found (required by
  /usr/lib64/libppl_c.so.2)

ENH: remove unused flex++ rule for SiCortex that was identical to the
general one anyhow.
This commit is contained in:
Mark Olesen
2010-03-29 10:59:35 +02:00
parent 09970cc01a
commit 0686bdf1e9
17 changed files with 4 additions and 35 deletions

View File

@ -1,6 +1,7 @@
AR = ar AR = ar
ARFLAGS = cr ARFLAGS = cr
RANLIB = ranlib RANLIB = ranlib
CPP = cpp
LD = ld LD = ld
GFLAGS = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION) GFLAGS = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION)

View File

@ -1,6 +0,0 @@
.SUFFIXES: .L
Ltoo = flex --c++ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@
.L.dep:
$(MAKE_DEP)

View File

@ -1,4 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld -A64 LD = ld -A64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

View File

@ -1,4 +1,4 @@
CPP = /lib/cpp $(GFLAGS) CPP = /lib/cpp
LD = ld -64 LD = ld -64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream

View File

@ -1,6 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

View File

@ -1,6 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

View File

@ -1,6 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

View File

@ -1,6 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

View File

@ -1,4 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

View File

@ -1,4 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

View File

@ -1,4 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

View File

@ -1,6 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
include $(GENERAL_RULES)/standard include $(GENERAL_RULES)/standard

View File

@ -1,8 +1,4 @@
CPP = /lib/cpp $(GFLAGS) -DICC_IA64_PREFETCH CPP = cpp -DICC_IA64_PREFETCH
AR = ar
ARFLAGS = cr
RANLIB = ranlib
LD = ld
GLIBS = -liberty GLIBS = -liberty

View File

@ -1,4 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

View File

@ -1,4 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld -m elf64ppc LD = ld -m elf64ppc
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

View File

@ -1,4 +1,3 @@
CPP = /lib/cpp $(GFLAGS)
LD = mingw32-ld LD = mingw32-ld
PROJECT_LIBS = -l$(WM_PROJECT) PROJECT_LIBS = -l$(WM_PROJECT)

View File

@ -1,4 +1,4 @@
CPP = /usr/lib/cpp -undef $(GFLAGS) CPP = /usr/lib/cpp -undef
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream