Просмотр исходного кода

Yet another wrong version check

Marek Safar 14 лет назад
Родитель
Сommit
e1298e2d43
2 измененных файлов с 2 добавлено и 6 удалено
  1. 1 5
      mcs/class/Moonlight.Build.Tasks/Makefile
  2. 1 1
      mcs/class/System.Dynamic/Makefile

+ 1 - 5
mcs/class/Moonlight.Build.Tasks/Makefile

@@ -5,14 +5,10 @@ include ../../build/rules.make
 LIBRARY = Moonlight.Build.Tasks.dll
 LIBRARY_NAME = Moonlight.Build.Tasks.dll
 
-ifeq (1.0, $(FRAMEWORK_VERSION))
-LIBRARY_NAME = dummy-Moonlight.Build.Tasks.dll
-endif
-
 ifeq (3.5, $(FRAMEWORK_VERSION))
 NAME_SUFFIX = .v3.5
 else
-ifeq (4.0, $(FRAMEWORK_VERSION))
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
 NAME_SUFFIX = .v4.0
 endif
 endif

+ 1 - 1
mcs/class/System.Dynamic/Makefile

@@ -7,7 +7,7 @@ LIBRARY = System.Dynamic.dll
 LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -r:System.Core.dll -r:System.dll
 
 # This is a .NET 4.0+ only assembly
-VALID_PROFILE := $(filter 4.0, $(FRAMEWORK_VERSION))
+VALID_PROFILE := $(filter 4, $(FRAMEWORK_VERSION_MAJOR))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Dynamic.dll
 NO_INSTALL = yes