From 405cf8129a8cf896e9b048d11dff7b2dc7c09afc Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 7 Dec 2017 15:41:58 +0000 Subject: [PATCH] CONFIG: update some wmake rules - initial settings for ADIOS2, linuxARM64Gcc, linuxARM64Clang --- wmake/rules/General/ADIOS2 | 13 +++++++++++++ wmake/rules/linux64Clang/c | 2 +- wmake/rules/linux64Clang/c++Debug | 2 +- wmake/rules/linux64Cray/c | 2 +- wmake/rules/linux64Cray/c++Debug | 2 +- wmake/rules/linux64Gcc/c | 2 +- wmake/rules/linux64Gcc/c++Debug | 2 +- wmake/rules/linux64GccKNL/c | 2 +- wmake/rules/linux64GccKNL/c++Debug | 2 +- wmake/rules/linux64Icc/c | 2 +- wmake/rules/linux64IccKNL/c | 2 +- wmake/rules/linuxARM64Clang/c | 17 +++++++++++++++++ wmake/rules/linuxARM64Clang/c++ | 25 +++++++++++++++++++++++++ wmake/rules/linuxARM64Clang/c++Debug | 2 ++ wmake/rules/linuxARM64Clang/c++Opt | 2 ++ wmake/rules/linuxARM64Clang/c++Prof | 2 ++ wmake/rules/linuxARM64Clang/cDebug | 2 ++ wmake/rules/linuxARM64Clang/cOpt | 2 ++ wmake/rules/linuxARM64Clang/cProf | 2 ++ wmake/rules/linuxARM64Clang/general | 9 +++++++++ wmake/rules/linuxARM64Clang/openmp | 4 ++++ wmake/rules/linuxARM64Gcc/c | 16 ++++++++++++++++ wmake/rules/linuxARM64Gcc/c++ | 25 +++++++++++++++++++++++++ wmake/rules/linuxARM64Gcc/c++Debug | 2 ++ wmake/rules/linuxARM64Gcc/c++Opt | 4 ++++ wmake/rules/linuxARM64Gcc/c++Prof | 2 ++ wmake/rules/linuxARM64Gcc/cDebug | 2 ++ wmake/rules/linuxARM64Gcc/cOpt | 2 ++ wmake/rules/linuxARM64Gcc/cProf | 2 ++ wmake/rules/linuxARM64Gcc/general | 10 ++++++++++ wmake/rules/linuxARM64Gcc/openmp | 4 ++++ wmake/rules/linuxARM7Gcc/c | 2 +- wmake/rules/linuxARM7Gcc/c++Debug | 2 +- wmake/rules/linuxARM7Gcc/c++Opt | 2 +- wmake/rules/linuxARM7Gcc/cOpt | 2 +- wmake/rules/linuxClang/c | 2 +- wmake/rules/linuxClang/c++Debug | 2 +- wmake/rules/linuxGcc/c | 2 +- wmake/rules/linuxGcc/c++Debug | 2 +- wmake/rules/linuxIA64Gcc/c | 2 +- wmake/rules/linuxIA64Gcc/c++Debug | 2 +- wmake/rules/linuxIA64Icc/c | 2 +- wmake/rules/linuxIcc/c | 2 +- wmake/rules/linuxPPC64Gcc/c | 2 +- wmake/rules/linuxPPC64Gcc/c++Debug | 2 +- wmake/rules/linuxPPC64leGcc/c | 2 +- wmake/rules/linuxPPC64leGcc/c++Debug | 2 +- 47 files changed, 175 insertions(+), 26 deletions(-) create mode 100644 wmake/rules/General/ADIOS2 create mode 100644 wmake/rules/linuxARM64Clang/c create mode 100644 wmake/rules/linuxARM64Clang/c++ create mode 100644 wmake/rules/linuxARM64Clang/c++Debug create mode 100644 wmake/rules/linuxARM64Clang/c++Opt create mode 100644 wmake/rules/linuxARM64Clang/c++Prof create mode 100644 wmake/rules/linuxARM64Clang/cDebug create mode 100644 wmake/rules/linuxARM64Clang/cOpt create mode 100644 wmake/rules/linuxARM64Clang/cProf create mode 100644 wmake/rules/linuxARM64Clang/general create mode 100644 wmake/rules/linuxARM64Clang/openmp create mode 100644 wmake/rules/linuxARM64Gcc/c create mode 100644 wmake/rules/linuxARM64Gcc/c++ create mode 100644 wmake/rules/linuxARM64Gcc/c++Debug create mode 100644 wmake/rules/linuxARM64Gcc/c++Opt create mode 100644 wmake/rules/linuxARM64Gcc/c++Prof create mode 100644 wmake/rules/linuxARM64Gcc/cDebug create mode 100644 wmake/rules/linuxARM64Gcc/cOpt create mode 100644 wmake/rules/linuxARM64Gcc/cProf create mode 100644 wmake/rules/linuxARM64Gcc/general create mode 100644 wmake/rules/linuxARM64Gcc/openmp diff --git a/wmake/rules/General/ADIOS2 b/wmake/rules/General/ADIOS2 new file mode 100644 index 0000000000..f158236942 --- /dev/null +++ b/wmake/rules/General/ADIOS2 @@ -0,0 +1,13 @@ +#-------------------------------*- makefile -*--------------------------------- +# ADIOS2 includes/libraries + +sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) +sinclude $(RULES)/mplib$(WM_MPLIB) + +# Obtain prefix and library information via adios2-config +ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix) +ADIOS_LIBS := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --libs) + +ADIOS_INC = -I${ADIOS_PREFIX}/include + +#------------------------------------------------------------------------------ diff --git a/wmake/rules/linux64Clang/c b/wmake/rules/linux64Clang/c index b743e3f68c..36f40bc364 100644 --- a/wmake/rules/linux64Clang/c +++ b/wmake/rules/linux64Clang/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = clang -m64 diff --git a/wmake/rules/linux64Clang/c++Debug b/wmake/rules/linux64Clang/c++Debug index 1c63335a3f..48f0b6643e 100644 --- a/wmake/rules/linux64Clang/c++Debug +++ b/wmake/rules/linux64Clang/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -g -DFULLDEBUG +c++DBUG = -g -DFULLDEBUG c++OPT = -O0 diff --git a/wmake/rules/linux64Cray/c b/wmake/rules/linux64Cray/c index d08f441440..a3e304ed80 100644 --- a/wmake/rules/linux64Cray/c +++ b/wmake/rules/linux64Cray/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = cc -m64 diff --git a/wmake/rules/linux64Cray/c++Debug b/wmake/rules/linux64Cray/c++Debug index 19bdb9c334..08680a0e4a 100644 --- a/wmake/rules/linux64Cray/c++Debug +++ b/wmake/rules/linux64Cray/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -ggdb3 -DFULLDEBUG +c++DBUG = -ggdb3 -DFULLDEBUG c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linux64Gcc/c b/wmake/rules/linux64Gcc/c index 1097b3a594..56b9e8ff72 100644 --- a/wmake/rules/linux64Gcc/c +++ b/wmake/rules/linux64Gcc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = gcc -m64 diff --git a/wmake/rules/linux64Gcc/c++Debug b/wmake/rules/linux64Gcc/c++Debug index 19bdb9c334..08680a0e4a 100644 --- a/wmake/rules/linux64Gcc/c++Debug +++ b/wmake/rules/linux64Gcc/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -ggdb3 -DFULLDEBUG +c++DBUG = -ggdb3 -DFULLDEBUG c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linux64GccKNL/c b/wmake/rules/linux64GccKNL/c index d0eb3eab57..db0bbc58f9 100644 --- a/wmake/rules/linux64GccKNL/c +++ b/wmake/rules/linux64GccKNL/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = gcc -m64 -march=knl diff --git a/wmake/rules/linux64GccKNL/c++Debug b/wmake/rules/linux64GccKNL/c++Debug index 19bdb9c334..08680a0e4a 100644 --- a/wmake/rules/linux64GccKNL/c++Debug +++ b/wmake/rules/linux64GccKNL/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -ggdb3 -DFULLDEBUG +c++DBUG = -ggdb3 -DFULLDEBUG c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linux64Icc/c b/wmake/rules/linux64Icc/c index 14a3a231d5..c405b37e24 100644 --- a/wmake/rules/linux64Icc/c +++ b/wmake/rules/linux64Icc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = +cWARN = cc = icc diff --git a/wmake/rules/linux64IccKNL/c b/wmake/rules/linux64IccKNL/c index 14a3a231d5..c405b37e24 100644 --- a/wmake/rules/linux64IccKNL/c +++ b/wmake/rules/linux64IccKNL/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = +cWARN = cc = icc diff --git a/wmake/rules/linuxARM64Clang/c b/wmake/rules/linuxARM64Clang/c new file mode 100644 index 0000000000..7a1e43e377 --- /dev/null +++ b/wmake/rules/linuxARM64Clang/c @@ -0,0 +1,17 @@ +SUFFIXES += .c + +cWARN = -Wall + +## cc = clang -m64 +cc = clang + +include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) + +cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC + +ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ + +LINK_LIBS = $(cDBUG) + +LINKLIBSO = $(cc) -shared +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxARM64Clang/c++ b/wmake/rules/linuxARM64Clang/c++ new file mode 100644 index 0000000000..2bf2892754 --- /dev/null +++ b/wmake/rules/linuxARM64Clang/c++ @@ -0,0 +1,25 @@ +SUFFIXES += .C .cc .cpp .cxx + +c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-undefined-var-template + +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value + +## CC = clang++ -std=c++11 -m64 +CC = clang++ -std=c++11 + +include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) + +ptFLAGS = -DNoRepository -ftemplate-depth-100 + +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC + +Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ +cxxtoo = $(Ctoo) +cctoo = $(Ctoo) +cpptoo = $(Ctoo) + +LINK_LIBS = $(c++DBUG) + +LINKLIBSO = $(CC) $(c++FLAGS) -shared +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed diff --git a/wmake/rules/linuxARM64Clang/c++Debug b/wmake/rules/linuxARM64Clang/c++Debug new file mode 100644 index 0000000000..48f0b6643e --- /dev/null +++ b/wmake/rules/linuxARM64Clang/c++Debug @@ -0,0 +1,2 @@ +c++DBUG = -g -DFULLDEBUG +c++OPT = -O0 diff --git a/wmake/rules/linuxARM64Clang/c++Opt b/wmake/rules/linuxARM64Clang/c++Opt new file mode 100644 index 0000000000..2aedabd628 --- /dev/null +++ b/wmake/rules/linuxARM64Clang/c++Opt @@ -0,0 +1,2 @@ +c++DBUG = +c++OPT = -O3 diff --git a/wmake/rules/linuxARM64Clang/c++Prof b/wmake/rules/linuxARM64Clang/c++Prof new file mode 100644 index 0000000000..3bda4dad55 --- /dev/null +++ b/wmake/rules/linuxARM64Clang/c++Prof @@ -0,0 +1,2 @@ +c++DBUG = -pg +c++OPT = -O2 diff --git a/wmake/rules/linuxARM64Clang/cDebug b/wmake/rules/linuxARM64Clang/cDebug new file mode 100644 index 0000000000..7b7adf10de --- /dev/null +++ b/wmake/rules/linuxARM64Clang/cDebug @@ -0,0 +1,2 @@ +cDBUG = -g -DFULLDEBUG +cOPT = -O0 diff --git a/wmake/rules/linuxARM64Clang/cOpt b/wmake/rules/linuxARM64Clang/cOpt new file mode 100644 index 0000000000..17318709f1 --- /dev/null +++ b/wmake/rules/linuxARM64Clang/cOpt @@ -0,0 +1,2 @@ +cDBUG = +cOPT = -O3 diff --git a/wmake/rules/linuxARM64Clang/cProf b/wmake/rules/linuxARM64Clang/cProf new file mode 100644 index 0000000000..ca3ac9bf5f --- /dev/null +++ b/wmake/rules/linuxARM64Clang/cProf @@ -0,0 +1,2 @@ +cDBUG = -pg +cOPT = -O2 diff --git a/wmake/rules/linuxARM64Clang/general b/wmake/rules/linuxARM64Clang/general new file mode 100644 index 0000000000..d83a18b000 --- /dev/null +++ b/wmake/rules/linuxARM64Clang/general @@ -0,0 +1,9 @@ +CPP = cpp -traditional-cpp $(GFLAGS) + +PROJECT_LIBS = -l$(WM_PROJECT) -ldl + +include $(GENERAL_RULES)/standard + +include $(DEFAULT_RULES)/openmp +include $(DEFAULT_RULES)/c +include $(DEFAULT_RULES)/c++ diff --git a/wmake/rules/linuxARM64Clang/openmp b/wmake/rules/linuxARM64Clang/openmp new file mode 100644 index 0000000000..bcb805f57c --- /dev/null +++ b/wmake/rules/linuxARM64Clang/openmp @@ -0,0 +1,4 @@ +# Flags for compiling/linking openmp + +COMP_OPENMP = -DUSE_OMP -fopenmp +LINK_OPENMP = -lgomp diff --git a/wmake/rules/linuxARM64Gcc/c b/wmake/rules/linuxARM64Gcc/c new file mode 100644 index 0000000000..3ee7538cbb --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/c @@ -0,0 +1,16 @@ +SUFFIXES += .c + +cWARN = -Wall + +cc = gcc + +include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) + +cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC + +ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ + +LINK_LIBS = $(cDBUG) + +LINKLIBSO = $(cc) -shared +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxARM64Gcc/c++ b/wmake/rules/linuxARM64Gcc/c++ new file mode 100644 index 0000000000..3985f54a9b --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/c++ @@ -0,0 +1,25 @@ +SUFFIXES += .C .cc .cpp .cxx + +c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \ + -Wno-invalid-offsetof -Wno-attributes + +# Suppress some warnings for flex++ and CGAL +c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds + +CC = g++ -std=c++11 + +include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) + +ptFLAGS = -DNoRepository -ftemplate-depth-100 + +c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC + +Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ +cxxtoo = $(Ctoo) +cctoo = $(Ctoo) +cpptoo = $(Ctoo) + +LINK_LIBS = $(c++DBUG) + +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/linuxARM64Gcc/c++Debug b/wmake/rules/linuxARM64Gcc/c++Debug new file mode 100644 index 0000000000..08680a0e4a --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/c++Debug @@ -0,0 +1,2 @@ +c++DBUG = -ggdb3 -DFULLDEBUG +c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxARM64Gcc/c++Opt b/wmake/rules/linuxARM64Gcc/c++Opt new file mode 100644 index 0000000000..2e3e8c3bb1 --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/c++Opt @@ -0,0 +1,4 @@ +c++DBUG = +c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps + +ROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxARM64Gcc/c++Prof b/wmake/rules/linuxARM64Gcc/c++Prof new file mode 100644 index 0000000000..858dde1ed2 --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/c++Prof @@ -0,0 +1,2 @@ +c++DBUG = -pg +c++OPT = -O2 diff --git a/wmake/rules/linuxARM64Gcc/cDebug b/wmake/rules/linuxARM64Gcc/cDebug new file mode 100644 index 0000000000..72b638f458 --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/cDebug @@ -0,0 +1,2 @@ +cDBUG = -ggdb -DFULLDEBUG +cOPT = -O1 -fdefault-inline -finline-functions diff --git a/wmake/rules/linuxARM64Gcc/cOpt b/wmake/rules/linuxARM64Gcc/cOpt new file mode 100644 index 0000000000..643c990ebd --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/cOpt @@ -0,0 +1,2 @@ +cDBUG = +cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps diff --git a/wmake/rules/linuxARM64Gcc/cProf b/wmake/rules/linuxARM64Gcc/cProf new file mode 100644 index 0000000000..ca3ac9bf5f --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/cProf @@ -0,0 +1,2 @@ +cDBUG = -pg +cOPT = -O2 diff --git a/wmake/rules/linuxARM64Gcc/general b/wmake/rules/linuxARM64Gcc/general new file mode 100644 index 0000000000..86f567e61d --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/general @@ -0,0 +1,10 @@ +CPP = cpp -traditional-cpp $(GFLAGS) +LD = ld + +PROJECT_LIBS = -l$(WM_PROJECT) -ldl + +include $(GENERAL_RULES)/standard + +include $(DEFAULT_RULES)/openmp +include $(DEFAULT_RULES)/c +include $(DEFAULT_RULES)/c++ diff --git a/wmake/rules/linuxARM64Gcc/openmp b/wmake/rules/linuxARM64Gcc/openmp new file mode 100644 index 0000000000..bcb805f57c --- /dev/null +++ b/wmake/rules/linuxARM64Gcc/openmp @@ -0,0 +1,4 @@ +# Flags for compiling/linking openmp + +COMP_OPENMP = -DUSE_OMP -fopenmp +LINK_OPENMP = -lgomp diff --git a/wmake/rules/linuxARM7Gcc/c b/wmake/rules/linuxARM7Gcc/c index dfae4adda0..3ee7538cbb 100644 --- a/wmake/rules/linuxARM7Gcc/c +++ b/wmake/rules/linuxARM7Gcc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = gcc diff --git a/wmake/rules/linuxARM7Gcc/c++Debug b/wmake/rules/linuxARM7Gcc/c++Debug index 19bdb9c334..08680a0e4a 100644 --- a/wmake/rules/linuxARM7Gcc/c++Debug +++ b/wmake/rules/linuxARM7Gcc/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -ggdb3 -DFULLDEBUG +c++DBUG = -ggdb3 -DFULLDEBUG c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxARM7Gcc/c++Opt b/wmake/rules/linuxARM7Gcc/c++Opt index 4b21a7609d..fe7b457de7 100644 --- a/wmake/rules/linuxARM7Gcc/c++Opt +++ b/wmake/rules/linuxARM7Gcc/c++Opt @@ -1,5 +1,5 @@ c++DBUG = -#c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard +#c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp ROUNDING_MATH = -frounding-math diff --git a/wmake/rules/linuxARM7Gcc/cOpt b/wmake/rules/linuxARM7Gcc/cOpt index 0ee3f66355..c80aa2b5c1 100644 --- a/wmake/rules/linuxARM7Gcc/cOpt +++ b/wmake/rules/linuxARM7Gcc/cOpt @@ -1,3 +1,3 @@ cDBUG = -#cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard +#cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp diff --git a/wmake/rules/linuxClang/c b/wmake/rules/linuxClang/c index 2c8e8a7f9c..59cf476f0e 100644 --- a/wmake/rules/linuxClang/c +++ b/wmake/rules/linuxClang/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = clang -m32 diff --git a/wmake/rules/linuxClang/c++Debug b/wmake/rules/linuxClang/c++Debug index 1c63335a3f..48f0b6643e 100644 --- a/wmake/rules/linuxClang/c++Debug +++ b/wmake/rules/linuxClang/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -g -DFULLDEBUG +c++DBUG = -g -DFULLDEBUG c++OPT = -O0 diff --git a/wmake/rules/linuxGcc/c b/wmake/rules/linuxGcc/c index 8eddde0490..5450517cee 100644 --- a/wmake/rules/linuxGcc/c +++ b/wmake/rules/linuxGcc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = gcc -m32 diff --git a/wmake/rules/linuxGcc/c++Debug b/wmake/rules/linuxGcc/c++Debug index 19bdb9c334..08680a0e4a 100644 --- a/wmake/rules/linuxGcc/c++Debug +++ b/wmake/rules/linuxGcc/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -ggdb3 -DFULLDEBUG +c++DBUG = -ggdb3 -DFULLDEBUG c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxIA64Gcc/c b/wmake/rules/linuxIA64Gcc/c index dfae4adda0..3ee7538cbb 100644 --- a/wmake/rules/linuxIA64Gcc/c +++ b/wmake/rules/linuxIA64Gcc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = gcc diff --git a/wmake/rules/linuxIA64Gcc/c++Debug b/wmake/rules/linuxIA64Gcc/c++Debug index 19bdb9c334..08680a0e4a 100644 --- a/wmake/rules/linuxIA64Gcc/c++Debug +++ b/wmake/rules/linuxIA64Gcc/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -ggdb3 -DFULLDEBUG +c++DBUG = -ggdb3 -DFULLDEBUG c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxIA64Icc/c b/wmake/rules/linuxIA64Icc/c index 2b19596b1a..2d8cda5910 100644 --- a/wmake/rules/linuxIA64Icc/c +++ b/wmake/rules/linuxIA64Icc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = +cWARN = cc = icc diff --git a/wmake/rules/linuxIcc/c b/wmake/rules/linuxIcc/c index c9f75c9021..e3c578ae15 100644 --- a/wmake/rules/linuxIcc/c +++ b/wmake/rules/linuxIcc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = +cWARN = cc = icc -gcc-version=400 diff --git a/wmake/rules/linuxPPC64Gcc/c b/wmake/rules/linuxPPC64Gcc/c index f973417062..dce6cc7466 100644 --- a/wmake/rules/linuxPPC64Gcc/c +++ b/wmake/rules/linuxPPC64Gcc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = gcc -m64 -mcpu=power5+ diff --git a/wmake/rules/linuxPPC64Gcc/c++Debug b/wmake/rules/linuxPPC64Gcc/c++Debug index 19bdb9c334..08680a0e4a 100644 --- a/wmake/rules/linuxPPC64Gcc/c++Debug +++ b/wmake/rules/linuxPPC64Gcc/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -ggdb3 -DFULLDEBUG +c++DBUG = -ggdb3 -DFULLDEBUG c++OPT = -O0 -fdefault-inline diff --git a/wmake/rules/linuxPPC64leGcc/c b/wmake/rules/linuxPPC64leGcc/c index c5e3c73eba..ec88f47627 100644 --- a/wmake/rules/linuxPPC64leGcc/c +++ b/wmake/rules/linuxPPC64leGcc/c @@ -1,6 +1,6 @@ SUFFIXES += .c -cWARN = -Wall +cWARN = -Wall cc = gcc -m64 -mcpu=power8 diff --git a/wmake/rules/linuxPPC64leGcc/c++Debug b/wmake/rules/linuxPPC64leGcc/c++Debug index 19bdb9c334..08680a0e4a 100644 --- a/wmake/rules/linuxPPC64leGcc/c++Debug +++ b/wmake/rules/linuxPPC64leGcc/c++Debug @@ -1,2 +1,2 @@ -c++DBUG = -ggdb3 -DFULLDEBUG +c++DBUG = -ggdb3 -DFULLDEBUG c++OPT = -O0 -fdefault-inline