hrev54131 adds 1 changeset to branch 'master'
old head: b7c0f682e4cf4020face128cf5694df65fac9652
new head: 27ecd4761ca65b229d0558995fdde2fbfb415045
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=27ecd4761ca6+%5Eb7c0f682e4cf
----------------------------------------------------------------------------
27ecd4761ca6: build: More miscellaneous fixes for MSYS.
Remove the .exe hack, as it is not needed.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54131
Commit: 27ecd4761ca65b229d0558995fdde2fbfb415045
URL: https://git.haiku-os.org/haiku/commit/?id=27ecd4761ca6
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun May 3 23:31:22 2020 UTC
----------------------------------------------------------------------------
2 files changed, 1 insertion(+), 18 deletions(-)
build/jam/MainBuildRules | 17 -----------------
src/tools/fs_shell/unistd.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 811981e8f5..d168fdb08c 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -622,14 +622,6 @@ rule BuildPlatformObjects
Objects $(sources) ;
}
-actions Win32ExtensionFix
-{
- if test -f $(1).exe ; then
- rm -f $(1)
- mv $(1).exe $(1)
- fi
-}
-
rule BuildPlatformMain
{
# Usage BuildPlatformMain <target> : <sources> : <libraries> ;
@@ -659,15 +651,6 @@ rule BuildPlatformMain
Main $(target) : $(sources) ;
LinkAgainst $(target) : $(libs) ;
- if $(HOST_PLATFORM) = mingw {
- # MinGW GCC adds the ".exe" extension. We cannot force
- # jam to use SUFEXE as haiku target executables are not
- # supposed to have this extension, thus finding
- # dependencies will fail for these.
- # The hack is to remove the extension after a successful
- # build of the Target.
- Win32ExtensionFix $(target) ;
- }
}
rule BuildPlatformSharedLibrary
diff --git a/src/tools/fs_shell/unistd.cpp b/src/tools/fs_shell/unistd.cpp
index ec9b4f4959..00be045a7b 100644
--- a/src/tools/fs_shell/unistd.cpp
+++ b/src/tools/fs_shell/unistd.cpp
@@ -28,7 +28,7 @@
# ifndef HAIKU_HOST_PLATFORM_DARWIN
# include <sys/disklabel.h>
# endif
-# elif defined(HAIKU_HOST_PLATFORM_CYGWIN)
+# elif defined(HAIKU_HOST_PLATFORM_MSYS)
# include <sys/ioctl.h>
# include <sys/stat.h>
# elif defined(HAIKU_HOST_PLATFORM_LINUX)
