zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: remove WM_LINK_LANGUAGE env variable (always c++)

Browse Source 
- was somewhat redundant in wmake/rules/General/general anyhow
This commit is contained in:
Mark Olesen
2018-04-24 14:59:47 +02:00
parent b4d38ab468
commit 2768500d57
6 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
etc/config.csh/settings
View File

@ -141,7 +141,6 @@ endsw
# wmake configuration # wmake configuration
setenv WM_DIR $WM_PROJECT_DIR/wmake setenv WM_DIR $WM_PROJECT_DIR/wmake
setenv WM_LINK_LANGUAGE c++
setenv WM_LABEL_OPTION Int$WM_LABEL_SIZE setenv WM_LABEL_OPTION Int$WM_LABEL_SIZE
setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION

1
etc/config.csh/unset
View File

@ -53,7 +53,6 @@ unsetenv WM_HOSTS
unsetenv WM_LABEL_OPTION unsetenv WM_LABEL_OPTION
unsetenv WM_LABEL_SIZE unsetenv WM_LABEL_SIZE
unsetenv WM_LDFLAGS unsetenv WM_LDFLAGS
unsetenv WM_LINK_LANGUAGE
unsetenv WM_MPLIB unsetenv WM_MPLIB
unsetenv WM_NCOMPPROCS unsetenv WM_NCOMPPROCS
unsetenv WM_OPTIONS unsetenv WM_OPTIONS

1
etc/config.sh/settings
View File

@ -135,7 +135,6 @@ esac
# wmake configuration # wmake configuration
export WM_DIR=$WM_PROJECT_DIR/wmake export WM_DIR=$WM_PROJECT_DIR/wmake
export WM_LINK_LANGUAGE=c++
export WM_LABEL_OPTION=Int$WM_LABEL_SIZE export WM_LABEL_OPTION=Int$WM_LABEL_SIZE
export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION

1
etc/config.sh/unset
View File

@ -44,7 +44,6 @@ unset WM_HOSTS
unset WM_LABEL_OPTION unset WM_LABEL_OPTION
unset WM_LABEL_SIZE unset WM_LABEL_SIZE
unset WM_LDFLAGS unset WM_LDFLAGS
unset WM_LINK_LANGUAGE
unset WM_MPLIB unset WM_MPLIB
unset WM_NCOMPPROCS unset WM_NCOMPPROCS
unset WM_OPTIONS unset WM_OPTIONS

4
wmake/rules/General/general
View File

@ -26,9 +26,9 @@ else
endif endif
include $(DEFAULT_RULES)/general include $(DEFAULT_RULES)/general
include $(DEFAULT_RULES)/$(WM_LINK_LANGUAGE) include $(DEFAULT_RULES)/c++
sinclude $(RULES)/general sinclude $(RULES)/general
sinclude $(RULES)/$(WM_LINK_LANGUAGE) sinclude $(RULES)/c++
include $(GENERAL_RULES)/transform include $(GENERAL_RULES)/transform

6
wmake/scripts/wmakeFunctions
View File

@ -27,10 +27,10 @@ MakeDir=Make
checkEnv() checkEnv()
{ {
for envar in WM_OPTIONS WM_LINK_LANGUAGE WM_DIR WM_PROJECT_DIR for check in WM_PROJECT_DIR WM_OPTIONS WM_DIR
do do
eval test "\$$envar" || { eval test "\$$check" || {
echo "$Script error: environment variable \$$envar not set" 1>&2 echo "$Script error: environment variable \$$check not set" 1>&2
exit 1 exit 1
} }
done done