From 7faf359bc1d105e390dc00956c60af2fbb08ee65 Mon Sep 17 00:00:00 2001 From: graham Date: Wed, 21 Jul 2010 10:58:53 +0100 Subject: [PATCH] COMP: adding -traditional-cpp to CPP variable. --- wmake/rules/SiCortex64Gcc/general | 1 + wmake/rules/linux64Gcc/general | 2 ++ wmake/rules/linux64Gcc43/general | 2 ++ wmake/rules/linux64Gcc44/general | 2 ++ wmake/rules/linux64Gcc45/general | 1 - wmake/rules/linux64Icc/general | 2 ++ wmake/rules/linuxGcc/general | 1 + wmake/rules/linuxGcc43/general | 1 + wmake/rules/linuxGcc44/general | 1 + wmake/rules/linuxGcc45/general | 1 - wmake/rules/linuxIA64Gcc/general | 1 + wmake/rules/linuxIA64Icc/general | 2 +- wmake/rules/linuxIcc/general | 1 + wmake/rules/linuxPPC64Gcc/general | 1 + 14 files changed, 16 insertions(+), 3 deletions(-) diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general index eb820ab36d..aeab411b5b 100644 --- a/wmake/rules/SiCortex64Gcc/general +++ b/wmake/rules/SiCortex64Gcc/general @@ -1,3 +1,4 @@ +CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -A64 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index e7faa0c0f2..809751cd0a 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -1,3 +1,5 @@ +CPP = cpp -traditional-cpp $(GFLAGS) + PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general index e7faa0c0f2..809751cd0a 100644 --- a/wmake/rules/linux64Gcc43/general +++ b/wmake/rules/linux64Gcc43/general @@ -1,3 +1,5 @@ +CPP = cpp -traditional-cpp $(GFLAGS) + PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general index e7faa0c0f2..809751cd0a 100644 --- a/wmake/rules/linux64Gcc44/general +++ b/wmake/rules/linux64Gcc44/general @@ -1,3 +1,5 @@ +CPP = cpp -traditional-cpp $(GFLAGS) + PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linux64Gcc45/general b/wmake/rules/linux64Gcc45/general index f9bb2e6b1e..fcd79624e9 100644 --- a/wmake/rules/linux64Gcc45/general +++ b/wmake/rules/linux64Gcc45/general @@ -1,4 +1,3 @@ -# need single-line output from cpp CPP = cpp -traditional-cpp PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general index e7faa0c0f2..4f411aec98 100644 --- a/wmake/rules/linux64Icc/general +++ b/wmake/rules/linux64Icc/general @@ -1,3 +1,5 @@ +CPP = /lib/cpp -traditional-cpp $(GFLAGS) + PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index ce84842fee..97ce8c940c 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -1,3 +1,4 @@ +CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general index ce84842fee..97ce8c940c 100644 --- a/wmake/rules/linuxGcc43/general +++ b/wmake/rules/linuxGcc43/general @@ -1,3 +1,4 @@ +CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general index ce84842fee..97ce8c940c 100644 --- a/wmake/rules/linuxGcc44/general +++ b/wmake/rules/linuxGcc44/general @@ -1,3 +1,4 @@ +CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc45/general b/wmake/rules/linuxGcc45/general index 91c54db85d..fdd03dc9a5 100644 --- a/wmake/rules/linuxGcc45/general +++ b/wmake/rules/linuxGcc45/general @@ -1,4 +1,3 @@ -# need single-line output from cpp CPP = cpp -traditional-cpp LD = ld -melf_i386 diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general index 7285501d98..44c2e33667 100644 --- a/wmake/rules/linuxIA64Gcc/general +++ b/wmake/rules/linuxIA64Gcc/general @@ -1,3 +1,4 @@ +CPP = cpp -traditional-cpp $(GFLAGS) PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general index 66953a9652..748cfe770d 100644 --- a/wmake/rules/linuxIA64Icc/general +++ b/wmake/rules/linuxIA64Icc/general @@ -1,4 +1,4 @@ -CPP = cpp -DICC_IA64_PREFETCH +CPP = /lib/cpp -traditional-cpp $(GFLAGS) -DICC_IA64_PREFETCH GLIBS = -liberty diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general index ce84842fee..e4d0cb7d7b 100644 --- a/wmake/rules/linuxIcc/general +++ b/wmake/rules/linuxIcc/general @@ -1,3 +1,4 @@ +CPP = /lib/cpp -traditional-cpp $(GFLAGS) LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general index 81927e682b..ad4126abe8 100644 --- a/wmake/rules/linuxPPC64Gcc/general +++ b/wmake/rules/linuxPPC64Gcc/general @@ -1,3 +1,4 @@ +CPP = cpp -traditional-cpp $(GFLAGS) LD = ld -m elf64ppc PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl