aboutsummaryrefslogtreecommitdiff
path: root/etc/environment
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-22 12:45:50 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-22 12:45:50 +0200
commit3ea6e51b28a06ad4c8b70e9f4d206a56e4771027 (patch)
treefa51f54b2ed460b5544ac0153389d1380e991189 /etc/environment
parent1fc77270c6af777adb80e1df917da7dc36c75d14 (diff)
Rename directory/option environment to environments
To be consistent with machines/ and toolchains/
Diffstat (limited to 'etc/environment')
-rwxr-xr-xetc/environment/default26
-rw-r--r--etc/environment/default-msvc.bat56
2 files changed, 0 insertions, 82 deletions
diff --git a/etc/environment/default b/etc/environment/default
deleted file mode 100755
index 82107f6..0000000
--- a/etc/environment/default
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# file : etc/environment/default
-# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-# license : TBC; see accompanying LICENSE file
-
-# Environment setup script for C/C++ compilation.
-
-c=gcc
-cxx=g++
-
-# $1 - target
-# $2 - bbot executable
-# $3+ - bbot options
-
-set -e # Exit on errors.
-
-t="$1"
-shift
-
-if test -n "$t"; then
- echo "unknown target: $t" 1>&2
- exit 1
-fi
-
-exec "$@" cc config.c="$c" config.cxx="$cxx"
diff --git a/etc/environment/default-msvc.bat b/etc/environment/default-msvc.bat
deleted file mode 100644
index 64c325d..0000000
--- a/etc/environment/default-msvc.bat
+++ /dev/null
@@ -1,56 +0,0 @@
-@echo off
-
-rem file : etc/environment/default-msvc.bat
-rem copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-rem license : TBC; see accompanying LICENSE file
-
-rem
-rem Environment setup script for C/C++ compilation with Visual Studio 15.
-rem
-
-rem %1 - target
-rem %2 - bbot executable
-rem %3+ - bbot options
-
-setlocal EnableExtensions EnableDelayedExpansion
-
-set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
-
-set "VCVARS32=%MSVC%\VC\Auxiliary\Build\vcvarsamd64_x86.bat"
-set "VCVARS64=%MSVC%\VC\Auxiliary\Build\vcvars64.bat"
-
-rem Based on target determine what we are building. If the target is
-rem not specified, then we build 64-bit by default.
-rem
-rem Note that an empty argument is passed as "" (literal quotes).
-rem
-if "_%1_" == "_x86_64-microsoft-win32-msvc14.1_" (
- set "VCVARS=%VCVARS64%"
-) else (
- if "_%1_" == "_i386-microsoft-win32-msvc14.1_" (
- set "VCVARS=%VCVARS32%"
- ) else (
- if _%1_ == _""_ (
- set "VCVARS=%VCVARS64%"
- ) else (
- echo error: unknown target %1
- goto error
- )
- )
-)
-
-call "%VCVARS%"
-if errorlevel 1 goto error
-
-%2 %3 %4 %5 %6 %7 %8 %9 cc config.c=cl config.cxx=cl
-if errorlevel 1 goto error
-
-goto end
-
-:error
-@echo off
-endlocal
-exit /b 1
-
-:end
-endlocal