[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] odd/multiarch 50086f8 1/2: Reconcile with master 3ff
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] odd/multiarch 50086f8 1/2: Reconcile with master 3ff6c0081 |
Date: |
Sun, 19 May 2019 19:36:12 -0400 (EDT) |
branch: odd/multiarch
commit 50086f8a4e2d6e488fdb1137f72ca8981dad3965
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Reconcile with master 3ff6c0081
These changes bring this branch into conformity with commit 3ff6c0081
on master, except for branch commit 31bf83ee that has since been
cherry-picked into master.
* GNUmakefile: Removed a comment that has since been addressed in
master.
* run.sh: Removed script because it has not proven useful.
---
GNUmakefile | 1 -
run.sh | 26 --------------------------
2 files changed, 27 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 4162687..b888b0c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -84,7 +84,6 @@ MAKEFLAGS := \
# more closely, changing the value of $(datadir), and perhaps using
# some other standard directories that are commented out for now.
-# alternative to 'set_toolchain.sh'
LMI_COMPILER ?= gcc
LMI_TRIPLET ?= i686-w64-mingw32
diff --git a/run.sh b/run.sh
deleted file mode 100755
index aaf33e2..0000000
--- a/run.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Run a command in an environment consistent with $LMI_COMPILER and
$LMI_TRIPLET.
-
-# Copyright (C) 2019 Gregory W. Chicares.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-#
-# http://savannah.nongnu.org/projects/lmi
-# email: <address@hidden>
-# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-set -e
-. ./set_toolchain.sh
-exec "$@"