songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CONFIG: refactor common link rules, support FOAM_EXTRA_CFLAGS (#1256)

Browse Source 
- additional cgal-headers-only rules (future use)

COMP: add -lgmp for CGAL with mpfr linkage
This commit is contained in:
Mark Olesen 2020-04-23 18:08:12 +02:00
parent 595579e01d
commit 78dc8c6ba6
55 changed files with 152 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/bashrc
View File

@ -142,10 +142,10 @@ projectDir="$HOME/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
# * on a 32-bit OS this option is ignored (always 32-bit)
#export WM_ARCH_OPTION=64
# [FOAM_EXTRA_CXXFLAGS]
# [FOAM_EXTRA_CFLAGS, FOAM_EXTRA_CXXFLAGS, FOAM_EXTRA_LDFLAGS]
# Additional compilation flags - do not inherit from the environment.
# Set after sourcing or via <prefs.sh> to avoid surprises.
unset FOAM_EXTRA_CXXFLAGS
unset FOAM_EXTRA_CFLAGS FOAM_EXTRA_CXXFLAGS FOAM_EXTRA_LDFLAGS
################################################################################
# NO (NORMAL) USER EDITING BELOW HERE

13
etc/config.csh/compiler
View File

@ -19,6 +19,10 @@
# Setup for custom compiler versions for OpenFOAM
# Per-compiler overrides in "compiler-$WM_COMPILER" files
#
# Note
# The default values for gcc/clang are not a recommendation,
# but typically correspond to the minimum usable version.
#
#------------------------------------------------------------------------------
switch ("$WM_COMPILER_TYPE")
@ -84,6 +88,9 @@ case ThirdParty:
case Gcc74*:
set gcc_version=gcc-7.4.0
breaksw
case Gcc75*:
set gcc_version=gcc-7.5.0
breaksw
case Gcc81*:
set gcc_version=gcc-8.1.0
breaksw
@ -93,12 +100,18 @@ case ThirdParty:
case Gcc83*:
set gcc_version=gcc-8.3.0
breaksw
case Gcc84*:
set gcc_version=gcc-8.4.0
breaksw
case Gcc91*:
set gcc_version=gcc-9.1.0
breaksw
case Gcc92*:
set gcc_version=gcc-9.2.0
breaksw
case Gcc93*:
set gcc_version=gcc-9.3.0
breaksw
case Clang:
set clang_version="$default_clang_version"

3
etc/config.csh/unset
View File

@ -85,8 +85,7 @@ unsetenv FOAM_CODE_TEMPLATES
unsetenv FOAM_CONFIG_ETC
unsetenv FOAM_CONFIG_MODE
unsetenv FOAM_ETC
unsetenv FOAM_EXTRA_CXXFLAGS
unsetenv FOAM_EXTRA_LDFLAGS
unsetenv FOAM_EXTRA_CFLAGS FOAM_EXTRA_CXXFLAGS FOAM_EXTRA_LDFLAGS
unsetenv FOAM_EXT_LIBBIN
unsetenv FOAM_JOB_DIR
unsetenv FOAM_LIBBIN

6
etc/config.sh/compiler
View File

@ -19,6 +19,10 @@
# Setup for custom compiler versions for OpenFOAM
# Per-compiler overrides in "compiler-$WM_COMPILER" files
#
# Note
# The default values for gcc/clang are not a recommendation,
# but typically correspond to the minimum usable version.
#
#------------------------------------------------------------------------------
case "$WM_COMPILER_TYPE" in
@ -58,8 +62,10 @@ ThirdParty)
Gcc81*) gcc_version=gcc-8.1.0 ;;
Gcc82*) gcc_version=gcc-8.2.0 ;;
Gcc83*) gcc_version=gcc-8.3.0 ;;
Gcc84*) gcc_version=gcc-8.4.0 ;;
Gcc91*) gcc_version=gcc-9.1.0 ;;
Gcc92*) gcc_version=gcc-9.2.0 ;;
Gcc93*) gcc_version=gcc-9.3.0 ;;
Clang) clang_version="$default_clang_version" ;;
Clang37*) clang_version=llvm-3.7.1 ;;

3
etc/config.sh/unset
View File

@ -72,8 +72,7 @@ unset FOAM_CODE_TEMPLATES
unset FOAM_CONFIG_ETC
unset FOAM_CONFIG_MODE
unset FOAM_ETC
unset FOAM_EXTRA_CXXFLAGS
unset FOAM_EXTRA_LDFLAGS
unset FOAM_EXTRA_CFLAGS FOAM_EXTRA_CXXFLAGS FOAM_EXTRA_LDFLAGS
unset FOAM_EXT_LIBBIN
unset FOAM_JOB_DIR
unset FOAM_LIBBIN

4
etc/cshrc
View File

@ -144,10 +144,10 @@ set projectDir=`lsof +p $$ |& sed -ne 's#^[^/]*##;\@/'"$projectName"'[^/]*/etc/c
# * on a 32-bit OS this option is ignored (always 32-bit)
#setenv WM_ARCH_OPTION 64
# [FOAM_EXTRA_CXXFLAGS]
# [FOAM_EXTRA_CFLAGS, FOAM_EXTRA_CXXFLAGS, FOAM_EXTRA_LDFLAGS]
# Additional compilation flags - do not inherit from the environment.
# Set after sourcing or via <prefs.csh> to avoid surprises.
unsetenv FOAM_EXTRA_CXXFLAGS
unsetenv FOAM_EXTRA_CFLAGS FOAM_EXTRA_CXXFLAGS FOAM_EXTRA_LDFLAGS
################################################################################
# NO (NORMAL) USER EDITING BELOW HERE

1
wmake/rules/General/CGAL
View File

@ -14,6 +14,7 @@ CGAL_LIBS = \
-L$(CGAL_ARCH_PATH)/lib \
-L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-lCGAL \
-lgmp \
-lmpfr
sinclude $(DEFAULT_RULES)/CGAL

4
wmake/rules/General/Clang/c
View File

@ -5,4 +5,6 @@ cc = clang
cARCH =
cDBUG =
cOPT = -O2
cWARN = -Wall
cWARN = -Wall $(FOAM_EXTRA_CFLAGS)
#------------------------------------------------------------------------------

5
wmake/rules/General/Clang/link-c Normal file
View File

@ -0,0 +1,5 @@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

5
wmake/rules/General/Clang/link-c++ Normal file
View File

@ -0,0 +1,5 @@
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared $(FOAM_EXTRA_LDFLAGS)
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed $(FOAM_EXTRA_LDFLAGS)

4
wmake/rules/General/Gcc/c
View File

@ -5,4 +5,6 @@ cc = gcc
cARCH =
cDBUG =
cOPT = -O2
cWARN = -Wall
cWARN = -Wall $(FOAM_EXTRA_CFLAGS)
#------------------------------------------------------------------------------

5
wmake/rules/General/Gcc/link-c Normal file
View File

@ -0,0 +1,5 @@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

11
wmake/rules/General/Gcc/link-c++ Normal file
View File

@ -0,0 +1,11 @@
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)
LINKEXE = $(CC) $(c++FLAGS) \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)

5
wmake/rules/General/Gcc/link-gold-c++ Normal file
View File

@ -0,0 +1,5 @@
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared -fuse-ld=gold
LINKEXE = $(CC) $(c++FLAGS) -fuse-ld=gold -L$(FOAM_LIBBIN)/dummy -lPstream

4
wmake/rules/General/Icc/c
View File

@ -5,4 +5,6 @@ cc = icc
cARCH =
cDBUG =
cOPT = -O2
cWARN =
cWARN = $(FOAM_EXTRA_CFLAGS)
#------------------------------------------------------------------------------

5
wmake/rules/General/Icc/link-c Normal file
View File

@ -0,0 +1,5 @@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cFLAGS) -shared
LINKEXE = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

11
wmake/rules/General/Icc/link-c++ Normal file
View File

@ -0,0 +1,11 @@
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)
LINKEXE = $(CC) $(c++FLAGS) \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)

4
wmake/rules/General/Pgi/c
View File

@ -5,4 +5,6 @@ cc = pgcc
cARCH =
cDBUG =
cOPT = -O2
cWARN =
cWARN = $(FOAM_EXTRA_CFLAGS)
#------------------------------------------------------------------------------

5
wmake/rules/General/Pgi/link-c Normal file
View File

@ -0,0 +1,5 @@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

5
wmake/rules/General/Pgi/link-c++ Normal file
View File

@ -0,0 +1,5 @@
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared $(FOAM_EXTRA_LDFLAGS)
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed $(FOAM_EXTRA_LDFLAGS)

9
wmake/rules/General/cgal-headers-only Normal file
View File

@ -0,0 +1,9 @@
# Headers-only CGAL
CGAL_INC = \
-I$(BOOST_ARCH_PATH)/include \
-I$(CGAL_ARCH_PATH)/include
CGAL_LIBS =
#------------------------------------------------------------------------------

1
wmake/rules/darwin64Clang/c
View File

@ -12,4 +12,5 @@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -Wl,-dylib,-undefined,dynamic_lookup
LINKEXE = $(cc) $(cARCH) -Wl,-execute,-undefined,dynamic_lookup

1
wmake/rules/darwin64Clang/c++
View File

@ -14,4 +14,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -Wl,-dylib,-undefined,dynamic_lookup
LINKEXE = $(CC) $(c++FLAGS) -Wl,-execute,-undefined,dynamic_lookup

5
wmake/rules/linux64Clang/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Clang/link-c

5
wmake/rules/linux64Clang/c++
View File

@ -11,7 +11,4 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed
include $(GENERAL_RULES)/Clang/link-c++

10
wmake/rules/linux64Cray/c
View File

@ -1,11 +1,10 @@
SUFFIXES += .c
# Cray compiler - a gcc variant/wrapper
include $(GENERAL_RULES)/Gcc/c
cc = cc
cARCH = -m64
cWARN = -Wall
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
@ -13,7 +12,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

6
wmake/rules/linux64Cray/c++
View File

@ -1,3 +1,4 @@
# Cray compiler - a gcc variant/wrapper
include $(GENERAL_RULES)/Gcc/c++
CC = CC -std=c++11
@ -13,7 +14,4 @@ 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
include $(GENERAL_RULES)/Gcc/link-c++

5
wmake/rules/linux64Gcc/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

5
wmake/rules/linux64Gcc/c++
View File

@ -11,7 +11,4 @@ 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
include $(GENERAL_RULES)/Gcc/link-c++

5
wmake/rules/linux64Icc/c
View File

@ -9,7 +9,6 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG) -L$(IA32ROOT)/lib
include $(GENERAL_RULES)/Icc/link-c
LINKLIBSO = $(cc) $(cFLAGS) -shared
LINKEXE = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
LINK_LIBS += -L$(IA32ROOT)/lib

5
wmake/rules/linux64Icc/c++
View File

@ -11,7 +11,6 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -L$(IA64ROOT)/lib
include $(GENERAL_RULES)/Icc/link-c++
LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed
LINK_LIBS += -L$(IA64ROOT)/lib

5
wmake/rules/linux64Pgi/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Pgi/link-c

5
wmake/rules/linux64Pgi/c++
View File

@ -11,7 +11,4 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed
include $(GENERAL_RULES)/Pgi/link-c++

6
wmake/rules/linuxARM64Arm/c
View File

@ -12,7 +12,7 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
include $(GENERAL_RULES)/Clang/link-c
LINKLIBSO = $(cc) $(cARCH) -shared -armpl
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs -armpl
LINKLIBSO += -armpl
LINKEXE += -armpl

6
wmake/rules/linuxARM64Arm/c++
View File

@ -14,7 +14,7 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
include $(GENERAL_RULES)/Clang/link-c++
LINKLIBSO = $(CC) $(c++FLAGS) -shared -armpl
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -armpl
LINKLIBSO += -armpl
LINKEXE += -armpl

5
wmake/rules/linuxARM64Clang/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Clang/link-c

5
wmake/rules/linuxARM64Clang/c++
View File

@ -11,7 +11,4 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed
include $(GENERAL_RULES)/Clang/link-c++

5
wmake/rules/linuxARM64Fujitsu/c
View File

@ -12,7 +12,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Clang/link-c

5
wmake/rules/linuxARM64Fujitsu/c++
View File

@ -14,7 +14,4 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed
include $(GENERAL_RULES)/Clang/link-c++

5
wmake/rules/linuxARM64Gcc/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

5
wmake/rules/linuxARM64Gcc/c++
View File

@ -11,7 +11,4 @@ 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
include $(GENERAL_RULES)/Gcc/link-c++

5
wmake/rules/linuxARM7Gcc/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

5
wmake/rules/linuxARM7Gcc/c++
View File

@ -11,7 +11,4 @@ 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
include $(GENERAL_RULES)/Gcc/link-c++

5
wmake/rules/linuxClang/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Clang/link-c

5
wmake/rules/linuxClang/c++
View File

@ -11,7 +11,4 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed
include $(GENERAL_RULES)/Clang/link-c++

5
wmake/rules/linuxGcc/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

5
wmake/rules/linuxGcc/c++
View File

@ -11,7 +11,4 @@ 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
include $(GENERAL_RULES)/Gcc/link-c++

5
wmake/rules/linuxIA64Gcc/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

5
wmake/rules/linuxIcc/c
View File

@ -9,7 +9,6 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG) -L$(IA32ROOT)/lib
include $(GENERAL_RULES)/Icc/link-c
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
LINK_LIBS += -L$(IA32ROOT)/lib

5
wmake/rules/linuxIcc/c++
View File

@ -11,7 +11,6 @@ cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -L$(IA32ROOT)/lib
include $(GENERAL_RULES)/Icc/link-c++
LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed
LINK_LIBS += -L$(IA32ROOT)/lib

5
wmake/rules/linuxPPC64Gcc/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

5
wmake/rules/linuxPPC64leGcc/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

5
wmake/rules/linuxPPC64leGcc/c++
View File

@ -11,7 +11,4 @@ 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
include $(GENERAL_RULES)/Gcc/link-c++

5
wmake/rules/solaris64Gcc/c
View File

@ -9,7 +9,4 @@ cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -f
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
include $(GENERAL_RULES)/Gcc/link-c

5
wmake/wmake
View File

@ -50,6 +50,9 @@
# 2. (OR) If `Allwmake` exists, use it.
# 3. (OR) descend into each sub-directory and repeat.
#
# Environment
# FOAM_EXTRA_CFLAGS FOAM_EXTRA_CXXFLAGS FOAM_EXTRA_LDFLAGS
#
# See also
# wmakeLnInclude, wmakeLnIncludeAll, wmakeCollect, wdep, wrmdep, wrmo,
# wclean, wcleanPlatform, wcleanLnIncludeAll
@ -118,7 +121,7 @@ Special targets:
objects Compile but not link
Environment
FOAM_EXTRA_CXXFLAGS
FOAM_EXTRA_CFLAGS FOAM_EXTRA_CXXFLAGS FOAM_EXTRA_LDFLAGS
HELP_TAIL_FULL
else