build: More miscellaneous fixes for MSYS.
Remove the .exe hack, as it is not needed.
This commit is contained in:
@@ -622,14 +622,6 @@ rule BuildPlatformObjects
|
|||||||
Objects $(sources) ;
|
Objects $(sources) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
actions Win32ExtensionFix
|
|
||||||
{
|
|
||||||
if test -f $(1).exe ; then
|
|
||||||
rm -f $(1)
|
|
||||||
mv $(1).exe $(1)
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
rule BuildPlatformMain
|
rule BuildPlatformMain
|
||||||
{
|
{
|
||||||
# Usage BuildPlatformMain <target> : <sources> : <libraries> ;
|
# Usage BuildPlatformMain <target> : <sources> : <libraries> ;
|
||||||
@@ -659,15 +651,6 @@ rule BuildPlatformMain
|
|||||||
|
|
||||||
Main $(target) : $(sources) ;
|
Main $(target) : $(sources) ;
|
||||||
LinkAgainst $(target) : $(libs) ;
|
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
|
rule BuildPlatformSharedLibrary
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
# ifndef HAIKU_HOST_PLATFORM_DARWIN
|
# ifndef HAIKU_HOST_PLATFORM_DARWIN
|
||||||
# include <sys/disklabel.h>
|
# include <sys/disklabel.h>
|
||||||
# endif
|
# endif
|
||||||
# elif defined(HAIKU_HOST_PLATFORM_CYGWIN)
|
# elif defined(HAIKU_HOST_PLATFORM_MSYS)
|
||||||
# include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
# include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
# elif defined(HAIKU_HOST_PLATFORM_LINUX)
|
# elif defined(HAIKU_HOST_PLATFORM_LINUX)
|
||||||
|
|||||||
Reference in New Issue
Block a user