From 787325a91641cd6cab16a10a23c2eaa0b9b05aa9 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 12 Apr 2019 12:59:11 +0200 Subject: [PATCH] COMP: manage cpu architecture with cARCH, c++ARCH internal make variables - allows better separation from compiler settings - use -fPIC instead of legacy -KPIC for intel compiler --- wmake/makefiles/info | 24 ++++++++++++++++-------- wmake/rules/General/Clang/c | 1 + wmake/rules/General/Clang/c++ | 1 + wmake/rules/General/Gcc/c | 1 + wmake/rules/General/Gcc/c++ | 1 + wmake/rules/General/Icc/c | 1 + wmake/rules/General/Icc/c++ | 1 + wmake/rules/General/Pgi/c | 1 + wmake/rules/General/Pgi/c++ | 1 + wmake/rules/darwin64Clang/c | 8 ++++---- wmake/rules/darwin64Clang/c++ | 4 ++-- wmake/rules/darwin64Clang/general | 3 +++ wmake/rules/linux64Clang/c | 8 ++++---- wmake/rules/linux64Clang/c++ | 4 ++-- wmake/rules/linux64Cray/c | 10 ++++++---- wmake/rules/linux64Cray/c++ | 6 ++++-- wmake/rules/linux64Gcc/c | 8 ++++---- wmake/rules/linux64Gcc/c++ | 4 ++-- wmake/rules/linux64Icc/c | 4 ++-- wmake/rules/linux64Icc/c++ | 4 ++-- wmake/rules/linux64Pgi/c | 8 ++++---- wmake/rules/linux64Pgi/c++ | 4 ++-- wmake/rules/linuxARM64Arm/c | 10 ++++++---- wmake/rules/linuxARM64Arm/c++ | 4 ++-- wmake/rules/linuxARM64Clang/c | 8 ++++---- wmake/rules/linuxARM64Clang/c++ | 4 ++-- wmake/rules/linuxARM64Gcc/c | 8 ++++---- wmake/rules/linuxARM64Gcc/c++ | 4 ++-- wmake/rules/linuxARM7Gcc/c | 8 ++++---- wmake/rules/linuxARM7Gcc/c++ | 4 ++-- wmake/rules/linuxClang/c | 8 ++++---- wmake/rules/linuxClang/c++ | 4 ++-- wmake/rules/linuxGcc/c | 8 ++++---- wmake/rules/linuxGcc/c++ | 4 ++-- wmake/rules/linuxIA64Gcc/c | 8 ++++---- wmake/rules/linuxIA64Gcc/c++ | 4 ++-- wmake/rules/linuxIA64Icc/c | 8 ++++---- wmake/rules/linuxIA64Icc/c++ | 4 ++-- wmake/rules/linuxIcc/c | 8 ++++---- wmake/rules/linuxIcc/c++ | 4 ++-- wmake/rules/linuxPPC64Gcc/c | 8 ++++---- wmake/rules/linuxPPC64Gcc/c++ | 4 ++-- wmake/rules/linuxPPC64leGcc/c | 8 ++++---- wmake/rules/linuxPPC64leGcc/c++ | 4 ++-- wmake/rules/solaris64Gcc/c | 8 ++++---- wmake/rules/solaris64Gcc/c++ | 4 ++-- wmake/wmake | 7 +++++-- 47 files changed, 144 insertions(+), 116 deletions(-) diff --git a/wmake/makefiles/info b/wmake/makefiles/info index c43841dcf7..9475e5799b 100644 --- a/wmake/makefiles/info +++ b/wmake/makefiles/info @@ -65,24 +65,32 @@ ext-so: compile-c: @echo "$(COMP_C)" -.PHONY: c -c: - @echo "$(firstword $(cc))" - -.PHONY: cflags -cflags: - @echo "$(wordlist 2,$(words $(COMPILE_C)), $(COMPILE_C))" - .PHONY: compile-cxx compile-cxx: @echo "$(COMPILE_CXX)" +.PHONY: c +c: + @echo "$(firstword $(cc))" + .PHONY: cxx cxx: @echo "$(firstword $(CC))" +.PHONY: cflags +cflags: + @echo "$(wordlist 2,$(words $(COMPILE_C)), $(COMPILE_C))" + .PHONY: cxxflags cxxflags: @echo "$(wordlist 2,$(words $(COMPILE_CXX)), $(COMPILE_CXX))" +.PHONY: cflags-arch +cflags-arch: + @echo "$(strip $(cARCH))" + +.PHONY: cxxflags-arch +cxxflags-arch: + @echo "$(strip $(c++ARCH))" + #----------------------------- vim: set ft=make: ------------------------------ diff --git a/wmake/rules/General/Clang/c b/wmake/rules/General/Clang/c index 8f1eb513d1..088f8e81e0 100644 --- a/wmake/rules/General/Clang/c +++ b/wmake/rules/General/Clang/c @@ -2,6 +2,7 @@ SUFFIXES += .c cc = clang +cARCH = cDBUG = cOPT = -O2 cWARN = -Wall diff --git a/wmake/rules/General/Clang/c++ b/wmake/rules/General/Clang/c++ index 4324a52e7c..aa379895cc 100644 --- a/wmake/rules/General/Clang/c++ +++ b/wmake/rules/General/Clang/c++ @@ -2,6 +2,7 @@ SUFFIXES += .C .cc .cpp .cxx CC = clang++ -std=c++11 +c++ARCH = c++DBUG = c++OPT = -O2 ptFLAGS = -DNoRepository -ftemplate-depth-100 diff --git a/wmake/rules/General/Gcc/c b/wmake/rules/General/Gcc/c index 123ffef0a6..31a0e198fe 100644 --- a/wmake/rules/General/Gcc/c +++ b/wmake/rules/General/Gcc/c @@ -2,6 +2,7 @@ SUFFIXES += .c cc = gcc +cARCH = cDBUG = cOPT = -O2 cWARN = -Wall diff --git a/wmake/rules/General/Gcc/c++ b/wmake/rules/General/Gcc/c++ index 6bacd2ee21..15b7870a3e 100644 --- a/wmake/rules/General/Gcc/c++ +++ b/wmake/rules/General/Gcc/c++ @@ -2,6 +2,7 @@ SUFFIXES += .C .cc .cpp .cxx CC = g++ -std=c++11 +c++ARCH = c++DBUG = c++OPT = -O2 ptFLAGS = -DNoRepository -ftemplate-depth-100 diff --git a/wmake/rules/General/Icc/c b/wmake/rules/General/Icc/c index 068f403ce1..273916af6b 100644 --- a/wmake/rules/General/Icc/c +++ b/wmake/rules/General/Icc/c @@ -2,6 +2,7 @@ SUFFIXES += .c cc = icc +cARCH = cDBUG = cOPT = -O2 cWARN = diff --git a/wmake/rules/General/Icc/c++ b/wmake/rules/General/Icc/c++ index b53fdb0841..2119fe8faf 100644 --- a/wmake/rules/General/Icc/c++ +++ b/wmake/rules/General/Icc/c++ @@ -2,6 +2,7 @@ SUFFIXES += .C .cc .cpp .cxx CC = icpc -std=c++11 +c++ARCH = c++DBUG = c++OPT = -O2 ptFLAGS = -DNoRepository diff --git a/wmake/rules/General/Pgi/c b/wmake/rules/General/Pgi/c index 861c12bdb1..9b924668d9 100644 --- a/wmake/rules/General/Pgi/c +++ b/wmake/rules/General/Pgi/c @@ -2,6 +2,7 @@ SUFFIXES += .c cc = pgcc +cARCH = cDBUG = cOPT = -O2 cWARN = diff --git a/wmake/rules/General/Pgi/c++ b/wmake/rules/General/Pgi/c++ index 39a8ec884f..b089aab167 100644 --- a/wmake/rules/General/Pgi/c++ +++ b/wmake/rules/General/Pgi/c++ @@ -2,6 +2,7 @@ SUFFIXES += .C .cc .cpp .cxx CC = pgc++ -std=c++11 +c++ARCH = c++DBUG = c++OPT = -O2 ptFLAGS = -DNoRepository diff --git a/wmake/rules/darwin64Clang/c b/wmake/rules/darwin64Clang/c index 7d69cc751e..8be23429bb 100644 --- a/wmake/rules/darwin64Clang/c +++ b/wmake/rules/darwin64Clang/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Clang/c -cc = clang -m64 -Ddarwin -ftrapping-math +cARCH = -m64 -ftrapping-math include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ LINK_LIBS = $(cDBUG) -LINKLIBSO = $(cc) -Wl,-dylib,-undefined,dynamic_lookup -LINKEXE = $(cc) -Wl,-execute,-undefined,dynamic_lookup +LINKLIBSO = $(cc) $(cARCH) -Wl,-dylib,-undefined,dynamic_lookup +LINKEXE = $(cc) $(cARCH) -Wl,-execute,-undefined,dynamic_lookup diff --git a/wmake/rules/darwin64Clang/c++ b/wmake/rules/darwin64Clang/c++ index 4964fa3543..dc821d51b4 100644 --- a/wmake/rules/darwin64Clang/c++ +++ b/wmake/rules/darwin64Clang/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Clang/c++ -CC = clang++ -std=c++11 -m64 -Ddarwin -ftrapping-math +c++ARCH = -m64 -ftrapping-math include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/darwin64Clang/general b/wmake/rules/darwin64Clang/general index 2eb439fe7d..37bf4f300e 100644 --- a/wmake/rules/darwin64Clang/general +++ b/wmake/rules/darwin64Clang/general @@ -11,4 +11,7 @@ include $(DEFAULT_RULES)/c++ # Shared library extension (with '.' separator) EXT_SO = .dylib +# Define general os-type +GFLAGS += -Ddarwin + # ----------------------------------------------------------------------------- diff --git a/wmake/rules/linux64Clang/c b/wmake/rules/linux64Clang/c index 437b2d05f7..38e5b92441 100644 --- a/wmake/rules/linux64Clang/c +++ b/wmake/rules/linux64Clang/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Clang/c -cc = clang -m64 +cARCH = -m64 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++ index e9ff2ac04d..3563f41601 100644 --- a/wmake/rules/linux64Clang/c++ +++ b/wmake/rules/linux64Clang/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Clang/c++ -CC = clang++ -std=c++11 -m64 +c++ARCH = -m64 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linux64Cray/c b/wmake/rules/linux64Cray/c index d0937d43b8..f61d9e038b 100644 --- a/wmake/rules/linux64Cray/c +++ b/wmake/rules/linux64Cray/c @@ -1,16 +1,18 @@ SUFFIXES += .c -cc = cc -m64 +cc = cc + +cARCH = -m64 cWARN = -Wall include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Cray/c++ b/wmake/rules/linux64Cray/c++ index acac32e84f..6e65cbc797 100644 --- a/wmake/rules/linux64Cray/c++ +++ b/wmake/rules/linux64Cray/c++ @@ -1,10 +1,12 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = CC -std=c++11 -m64 +CC = CC -std=c++11 + +c++ARCH = -m64 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linux64Gcc/c b/wmake/rules/linux64Gcc/c index dc18a9e401..b820078e56 100644 --- a/wmake/rules/linux64Gcc/c +++ b/wmake/rules/linux64Gcc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Gcc/c -cc = gcc -m64 +cARCH = -m64 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++ index 22c4d47b0b..80665cde62 100644 --- a/wmake/rules/linux64Gcc/c++ +++ b/wmake/rules/linux64Gcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 -m64 +c++ARCH = -m64 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linux64Icc/c b/wmake/rules/linux64Icc/c index b44d572c26..6003b1f2f5 100644 --- a/wmake/rules/linux64Icc/c +++ b/wmake/rules/linux64Icc/c @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Icc/c -cc = icc +cARCH = include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++ index b783705543..182e53128e 100644 --- a/wmake/rules/linux64Icc/c++ +++ b/wmake/rules/linux64Icc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Icc/c++ -CC = icpc -std=c++11 -fp-trap=common -fp-model precise +c++ARCH = -fp-trap=common -fp-model precise include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linux64Pgi/c b/wmake/rules/linux64Pgi/c index 3a9204233e..d1145645ab 100644 --- a/wmake/rules/linux64Pgi/c +++ b/wmake/rules/linux64Pgi/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Pgi/c -cc = pgcc -m64 +cARCH = -m64 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Pgi/c++ b/wmake/rules/linux64Pgi/c++ index 4fc97794e8..6e47d384bd 100644 --- a/wmake/rules/linux64Pgi/c++ +++ b/wmake/rules/linux64Pgi/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Pgi/c++ -CC = pgc++ -std=c++11 -m64 +c++ARCH = -m64 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxARM64Arm/c b/wmake/rules/linuxARM64Arm/c index 06b574e59f..a65582546f 100644 --- a/wmake/rules/linuxARM64Arm/c +++ b/wmake/rules/linuxARM64Arm/c @@ -1,16 +1,18 @@ SUFFIXES += .c -cc = armclang -mcpu=native +cc = armclang + +cARCH = -mcpu=native cWARN = -Wall include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ LINK_LIBS = $(cDBUG) -LINKLIBSO = $(cc) -shared -armpl -LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs -armpl +LINKLIBSO = $(cc) $(cARCH) -shared -armpl +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs -armpl diff --git a/wmake/rules/linuxARM64Arm/c++ b/wmake/rules/linuxARM64Arm/c++ index 4bbc646aec..e2443e9176 100644 --- a/wmake/rules/linuxARM64Arm/c++ +++ b/wmake/rules/linuxARM64Arm/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Clang/c++ -CC = armclang++ -std=c++11 -mcpu=native +c++ARCH = -mcpu=native include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxARM64Clang/c b/wmake/rules/linuxARM64Clang/c index c8467204e7..52b8713382 100644 --- a/wmake/rules/linuxARM64Clang/c +++ b/wmake/rules/linuxARM64Clang/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Clang/c -cc = clang +cARCH = include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxARM64Clang/c++ b/wmake/rules/linuxARM64Clang/c++ index 2e9bce109a..7cd04dbbaa 100644 --- a/wmake/rules/linuxARM64Clang/c++ +++ b/wmake/rules/linuxARM64Clang/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Clang/c++ -CC = clang++ -std=c++11 +c++ARCH = include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxARM64Gcc/c b/wmake/rules/linuxARM64Gcc/c index 77c03e62f8..ab01c6bebe 100644 --- a/wmake/rules/linuxARM64Gcc/c +++ b/wmake/rules/linuxARM64Gcc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Gcc/c -cc = gcc +cARCH = include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxARM64Gcc/c++ b/wmake/rules/linuxARM64Gcc/c++ index 00a88b07a1..1058e80ba7 100644 --- a/wmake/rules/linuxARM64Gcc/c++ +++ b/wmake/rules/linuxARM64Gcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 +c++ARCH = include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxARM7Gcc/c b/wmake/rules/linuxARM7Gcc/c index 2cff6a24d7..92bfac77eb 100644 --- a/wmake/rules/linuxARM7Gcc/c +++ b/wmake/rules/linuxARM7Gcc/c @@ -1,16 +1,16 @@ SUFFIXES += .c -cc = gcc -mcpu=cortex-a9 +cARCH = -mcpu=cortex-a9 cWARN = -Wall include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++ index a1cf1ad6cf..93b7089208 100644 --- a/wmake/rules/linuxARM7Gcc/c++ +++ b/wmake/rules/linuxARM7Gcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 -mcpu=cortex-a9 +c++ARCH = -mcpu=cortex-a9 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxClang/c b/wmake/rules/linuxClang/c index 4fd84438e5..608a1ef564 100644 --- a/wmake/rules/linuxClang/c +++ b/wmake/rules/linuxClang/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Clang/c -cc = clang -m32 +cARCH = -m32 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++ index f5e87a0c17..19b5fa154a 100644 --- a/wmake/rules/linuxClang/c++ +++ b/wmake/rules/linuxClang/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Clang/c++ -CC = clang++ -std=c++11 -m32 +c++ARCH = -m32 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxGcc/c b/wmake/rules/linuxGcc/c index 69a4dbd303..a85ced9183 100644 --- a/wmake/rules/linuxGcc/c +++ b/wmake/rules/linuxGcc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Gcc/c -cc = gcc -m32 +cARCH = -m32 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++ index 4566aa9bda..e136864805 100644 --- a/wmake/rules/linuxGcc/c++ +++ b/wmake/rules/linuxGcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 -m32 +c++ARCH = -m32 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxIA64Gcc/c b/wmake/rules/linuxIA64Gcc/c index 77c03e62f8..ab01c6bebe 100644 --- a/wmake/rules/linuxIA64Gcc/c +++ b/wmake/rules/linuxIA64Gcc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Gcc/c -cc = gcc +cARCH = include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++ index 68329d01a3..5a155804a5 100644 --- a/wmake/rules/linuxIA64Gcc/c++ +++ b/wmake/rules/linuxIA64Gcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 +c++ARCH = include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxIA64Icc/c b/wmake/rules/linuxIA64Icc/c index 0c2300c88d..d895b081f6 100644 --- a/wmake/rules/linuxIA64Icc/c +++ b/wmake/rules/linuxIA64Icc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Icc/c -cc = icc +cARCH = include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ LINK_LIBS = $(cDBUG) -L$(IA32ROOT)/lib -LINKLIBSO = $(cc) -i_dynamic -LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs +LINKLIBSO = $(cc) $(cARCH) -i_dynamic +LINKEXE = $(cc) $(cARCH) -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxIA64Icc/c++ b/wmake/rules/linuxIA64Icc/c++ index 8fce549e21..2671f6e099 100644 --- a/wmake/rules/linuxIA64Icc/c++ +++ b/wmake/rules/linuxIA64Icc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Icc/c++ -CC = icpc -std=c++11 +c++ARCH = include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxIcc/c b/wmake/rules/linuxIcc/c index 0e922873af..cfbf5ba25d 100644 --- a/wmake/rules/linuxIcc/c +++ b/wmake/rules/linuxIcc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Icc/c -cc = icc -gcc-version=400 +cARCH = -gcc-version=400 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -KPIC +cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@ LINK_LIBS = $(cDBUG) -L$(IA32ROOT)/lib -LINKLIBSO = $(cc) $(cFLAGS) -shared -LINKEXE = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxIcc/c++ b/wmake/rules/linuxIcc/c++ index 3cab0fd07a..21784c7376 100644 --- a/wmake/rules/linuxIcc/c++ +++ b/wmake/rules/linuxIcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Icc/c++ -CC = icpc -std=c++11 -fp-trap=common -fp-model precise +c++ARCH = -fp-trap=common -fp-model precise include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -KPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxPPC64Gcc/c b/wmake/rules/linuxPPC64Gcc/c index 7e3d265de2..743965975c 100644 --- a/wmake/rules/linuxPPC64Gcc/c +++ b/wmake/rules/linuxPPC64Gcc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Gcc/c -cc = gcc -m64 -mcpu=power5+ +cARCH = -m64 -mcpu=power5+ include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++ index 161b9ff196..64468cc162 100644 --- a/wmake/rules/linuxPPC64Gcc/c++ +++ b/wmake/rules/linuxPPC64Gcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 -m64 -mcpu=power5+ +c++ARCH = -m64 -mcpu=power5+ include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/linuxPPC64leGcc/c b/wmake/rules/linuxPPC64leGcc/c index b91dadc8fa..56998e95c5 100644 --- a/wmake/rules/linuxPPC64leGcc/c +++ b/wmake/rules/linuxPPC64leGcc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Gcc/c -cc = gcc -m64 -mcpu=power8 +cARCH = -m64 -mcpu=power8 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxPPC64leGcc/c++ b/wmake/rules/linuxPPC64leGcc/c++ index 1dab734831..eefe47dc56 100644 --- a/wmake/rules/linuxPPC64leGcc/c++ +++ b/wmake/rules/linuxPPC64leGcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 -m64 -mcpu=power8 +c++ARCH = -m64 -mcpu=power8 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/rules/solaris64Gcc/c b/wmake/rules/solaris64Gcc/c index dc18a9e401..b820078e56 100644 --- a/wmake/rules/solaris64Gcc/c +++ b/wmake/rules/solaris64Gcc/c @@ -1,14 +1,14 @@ include $(GENERAL_RULES)/Gcc/c -cc = gcc -m64 +cARCH = -m64 include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION) -cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC +cFLAGS = $(cARCH) $(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 +LINKLIBSO = $(cc) $(cARCH) -shared +LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/solaris64Gcc/c++ b/wmake/rules/solaris64Gcc/c++ index 03e45effb0..ac09d1e791 100644 --- a/wmake/rules/solaris64Gcc/c++ +++ b/wmake/rules/solaris64Gcc/c++ @@ -1,10 +1,10 @@ include $(GENERAL_RULES)/Gcc/c++ -CC = g++ -std=c++11 -m64 +c++ARCH = -m64 include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION) -c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC +c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@ cxxtoo = $(Ctoo) diff --git a/wmake/wmake b/wmake/wmake index 71ecf5ccb6..65dc6282dc 100755 --- a/wmake/wmake +++ b/wmake/wmake @@ -83,7 +83,10 @@ options: -show-c Print C compiler value -show-cflags Print C compiler flags -show-cxx Print C++ compiler value + -show-cxx-arch Print C compiler flags -show-cxxflags Print C++ compiler flags + -show-cflags-arch The C compiler arch flag (eg, -m64 etc) + -show-cxxflags-arch The C++ compiler arch flag (eg, -m64 etc) -h | -help Print the usage @@ -141,8 +144,8 @@ do export WM_QUIET=true ;; -show-api | -show-ext-so | \ - -show-compile-c | -show-c | -show-cflags | \ - -show-compile-cxx | -show-cxx | -show-cxxflags) + -show-compile-c | -show-c | -show-cflags | -show-cflags-arch | \ + -show-compile-cxx | -show-cxx | -show-cxxflags | -show-cxxflags-arch ) $make -f $WM_DIR/makefiles/info "${1#-show-}" optShow=true ;;