[mobile_static] Move PLATFORM_AOT_SUFFIX into configure.ac

diff --git a/configure.ac b/configure.ac
index 81d0b7e275de8b3b3727b817d1af3164a70596f4..35340782ccb5424e5fed273b3820d3d32b14174c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,18 @@ AM_CONDITIONAL(PLATFORM_DARWIN, test x$host_darwin = xyes)
 AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
 AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes)
 
+if test -z "$PLATFORM_DARWIN_TRUE"; then :
+PLATFORM_AOT_SUFFIX=.dylib
+fi
+
+if test -z "$PLATFORM_LINUX_TRUE"; then :
+PLATFORM_AOT_SUFFIX=.so
+fi
+
+AC_SUBST(PLATFORM_AOT_SUFFIX)
+
+## PLATFORM_AOT_SUFFIX not so simple for windows :-)
+
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
 AC_CHECK_TOOL(CXX, g++, g++)
@@ -4216,6 +4228,10 @@ fi
       echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make
     fi
 
+    if test "x$PLATFORM_AOT_SUFFIX" != "x"; then
+      echo "PLATFORM_AOT_SUFFIX = $PLATFORM_AOT_SUFFIX" >> $mcs_topdir/build/config.make
+    fi
+
        if test x$AOT_SUPPORTED = xyes -a x$enable_system_aot = xdefault; then
           enable_system_aot=yes
        fi

diff --git a/mcs/build/platforms/darwin.make b/mcs/build/platforms/darwin.make
index bfc73413391266a012d5977ab25d4adb902a7167..4b7b279f0c701ffc6fa0097267a0111bb2d95590 100644 (file)
--- a/mcs/build/platforms/darwin.make
+++ b/mcs/build/platforms/darwin.make
@@ -23,8 +23,6 @@ PLATFORM_PATH_SEPARATOR = :
 # This is for changing / to \ on windows
 PLATFORM_CHANGE_SEPARATOR_CMD = cat
 
-PLATFORM_AOT_SUFFIX = .dylib
-
 hidden_prefix = .
 hidden_suffix = 
 

diff --git a/mcs/build/platforms/linux.make b/mcs/build/platforms/linux.make
index fd54351c47bf9d2deab761d1dd64c693afa522d9..00504140796593b770c9295ba9c53e04352f171d 100644 (file)
--- a/mcs/build/platforms/linux.make
+++ b/mcs/build/platforms/linux.make
@@ -23,8 +23,6 @@ PLATFORM_PATH_SEPARATOR = :
 # This is for changing / to \ on windows
 PLATFORM_CHANGE_SEPARATOR_CMD = cat
 
-PLATFORM_AOT_SUFFIX = .so
-
 hidden_prefix = .
 hidden_suffix = 
 

diff --git a/mcs/build/platforms/win32.make b/mcs/build/platforms/win32.make
index d5df46e9da8bb1791901c2f8ab33dc5c01c2a41e..bed99f53387d0a7b9860fcb5334478d926a22769 100644 (file)
--- a/mcs/build/platforms/win32.make
+++ b/mcs/build/platforms/win32.make
@@ -26,9 +26,6 @@ PLATFORM_PATH_SEPARATOR = ;
 
 override CURDIR:=$(shell cygpath -m $(CURDIR))
 
-## not so simple :-)
-#PLATFORM_AOT_SUFFIX = .dll
-
 hidden_prefix = 
 hidden_suffix = .tmp
 

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index df4a73877acb4baa01fea44180a9a8e49df9cb4d..0a97198acedbdad3ada0309237d431cf37f8be86 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -755,8 +755,8 @@ TESTSI_IL=$(TEST_IL_SRC:.il=.exe)
 TESTBS=$(BENCHSRC:.cs=.exe)
 STRESS_TESTS=$(STRESS_TESTS_SRC:.cs=.exe)
 
-PREREQSI_IL_AOT=$(PREREQ_IL_SRC:.il=.exe.$(PLATFORM_AOT_SUFFIX))
-PREREQSI_CS_AOT=$(PREREQ_CS_SRC:.cs=.exe.$(PLATFORM_AOT_SUFFIX))
+PREREQSI_IL_AOT=$(PREREQ_IL_SRC:.il=.exe$(PLATFORM_AOT_SUFFIX))
+PREREQSI_CS_AOT=$(PREREQ_CS_SRC:.cs=.exe$(PLATFORM_AOT_SUFFIX))
 
 EXTRA_DIST=test-driver test-runner.cs $(TEST_CS_SRC_DIST) $(TEST_IL_SRC) \
        $(BENCHSRC) $(STRESS_TESTS_SRC) stress-runner.pl $(PREREQ_IL_SRC) $(PREREQ_CS_SRC)
@@ -771,10 +771,10 @@ endif
 %.exe: %.cs TestDriver.dll
        $(MCS) -r:System.dll -r:System.Xml.dll -r:System.Core.dll -r:TestDriver.dll $(TEST_DRIVER_HARD_KILL_FEATURE) -out:$@ $<
 
-%.exe.$(PLATFORM_AOT_SUFFIX): %.exe 
+%.exe$(PLATFORM_AOT_SUFFIX): %.exe 
        $(RUNTIME) $(AOT_BUILD_FLAGS) $<
 
-%.dll.$(PLATFORM_AOT_SUFFIX): %.dll 
+%.dll$(PLATFORM_AOT_SUFFIX): %.dll 
        $(RUNTIME) $(AOT_BUILD_FLAGS) $<
 
 # mkbundle works on ppc, but the pkg-config POC doesn't when run with make test