diff options
| author | lloyd <[email protected]> | 2015-04-27 12:45:53 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-04-27 12:45:53 +0000 |
| commit | 77d259fdcb4d0aaf3a760836bc6dca5642077be5 (patch) | |
| tree | ecc09c00a29d084f79414db075cc0755ba841e6a | |
| parent | 871b26cc455ea4539f41477c92df042d654521b4 (diff) | |
Add .exe suffix to MinGW and Cygwin binaries also
| -rwxr-xr-x | configure.py | 3 | ||||
| -rw-r--r-- | src/build-data/os/cygwin.txt | 2 | ||||
| -rw-r--r-- | src/build-data/os/mingw.txt | 1 | ||||
| -rw-r--r-- | src/build-data/os/windows.txt | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/configure.py b/configure.py index be0efb983..9abeade78 100755 --- a/configure.py +++ b/configure.py @@ -941,6 +941,7 @@ class OsInfo(object): lex_me_harder(infofile, self, ['aliases', 'target_features'], { 'os_type': None, + 'program_suffix': '', 'obj_suffix': 'o', 'so_suffix': 'so', 'static_suffix': 'a', @@ -1230,7 +1231,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'makefile_path': prefix_with_build_dir('Makefile'), - 'program_suffix': options.program_suffix or ('' if options.os != 'windows' else '.exe'), + 'program_suffix': options.program_suffix or osinfo.program_suffix, 'prefix': options.prefix or osinfo.install_root, 'destdir': options.destdir or options.prefix or osinfo.install_root, diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt index 9ec86736d..bedb10732 100644 --- a/src/build-data/os/cygwin.txt +++ b/src/build-data/os/cygwin.txt @@ -1,5 +1,7 @@ os_type unix +program_suffix .exe + # Cygwin supports shared libs fine, but there are problems with making a Botan # shared library when libraries it depends on are static-only (such as libz). # So until I can figure out a work-around, it's disabled. diff --git a/src/build-data/os/mingw.txt b/src/build-data/os/mingw.txt index 59d9db348..4f3e7f08b 100644 --- a/src/build-data/os/mingw.txt +++ b/src/build-data/os/mingw.txt @@ -1,5 +1,6 @@ os_type windows +program_suffix .exe obj_suffix o so_suffix dll static_suffix a diff --git a/src/build-data/os/windows.txt b/src/build-data/os/windows.txt index 3ac33a6ae..b72ef0768 100644 --- a/src/build-data/os/windows.txt +++ b/src/build-data/os/windows.txt @@ -1,5 +1,6 @@ os_type windows +program_suffix .exe obj_suffix obj so_suffix dll static_suffix lib |