Remove setting of environment variables

rajutkarsh07 · Feb 1, 2017 · bbc27f7 · bbc27f7
1 parent 01b12b9
commit bbc27f7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -89,6 +89,7 @@ before_install:
 
   # Print debug info:
   - echo "$($CC --version)"
+  - echo "$($CXX --version)"
   - echo "$($FC --version)"
 
   - git --version
@@ -106,7 +107,7 @@ before_install:
 
 
 install:
-  - "make FC=$FC FORTRAN_COMPILER=$FORTRAN_COMPILER CC=$CC C_COMPILER=$C_COMPILER CXX=$CXX CXX_COMPILER=$CXX_COMPILER LINKER=$LINKER install"
+  - "make FC=$FC FORTRAN_COMPILER=$FORTRAN_COMPILER install"
 
 
 script:

diff --git a/appveyor.yml b/appveyor.yml
@@ -208,7 +208,7 @@ install:
   - cmd: echo %PATH%
 
   # Perform installation tasks:
-  - cmd: '%WIN_MAKE% FC=%FC% FORTRAN_COMPILER=%FORTRAN_COMPILER% CC=%CC% C_COMPILER=%C_COMPILER% CXX=%CXX% CXX_COMPILER=%CXX_COMPILER% NODE_GYP_FLAGS="--python %PYTHON% --msvs_version=2013" install'
+  - cmd: '%WIN_MAKE% FC=%FC% FORTRAN_COMPILER=%FORTRAN_COMPILER% NODE_GYP_FLAGS="--python %PYTHON% --msvs_version=2013" install'
 
 
 build_script:

diff --git a/tools/ci/circle/script b/tools/ci/circle/script
@@ -161,7 +161,7 @@ clean_node() {
 # $1 - log file
 install() {
 	echo 'Installing...' >&2
-	make FC=gfortran FORTRAN_COMPILER=gfortran CC=gcc C_COMPILER=gcc CXX=g++ CXX_COMPILER=g++ LINKER=g++ install >> "$1" 2>&1
+	make FC=gfortran FORTRAN_COMPILER=gfortran install >> "$1" 2>&1
 	if [[ "$?" -ne 0 ]]; then
 		echo 'Error occurred during install.' >&2
 		return 1

diff --git a/tools/make/lib/addons/Makefile b/tools/make/lib/addons/Makefile
@@ -75,9 +75,6 @@ install-addons: clean-addons
 		echo "Building add-on: $$pkg"; \
 		cd $$pkg && \
 			FC=$(FC) \
-			CC=$(CC) \
-			CXX=$(CXX) \
-			LINK=$(LD) \
 			fPIC=$(fPIC) \
 			$(NODE_GYP) $(NODE_GYP_FLAGS) rebuild \
 		|| exit 1; \