aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-04-25 11:01:10 +0200
committerLukas Larsson <[email protected]>2017-04-25 11:01:10 +0200
commit6b57999ee020e5b1ebd8781ad7008b14cdd49688 (patch)
tree0adbdb7225eec95ea456d8cf74d5a210ce5f219d /lib
parent0eb103aa9e05b88e4c4337973b16ed2a7e0039f7 (diff)
parent8434b76e48b4ad1fe47b1d38dc3cac0b50d7d52d (diff)
downloadotp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.tar.gz
otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.tar.bz2
otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.zip
Merge branch 'lukas/erts/deprecate-non-smp/OTP-14272'
* lukas/erts/deprecate-non-smp/OTP-14272: erts: Fix testcases for smp +S 1:1 erts: Deprecate the non-smp emulators
Diffstat (limited to 'lib')
-rw-r--r--lib/hipe/rtl/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
index b4cdf8b1f2..357f1f6950 100644
--- a/lib/hipe/rtl/Makefile
+++ b/lib/hipe/rtl/Makefile
@@ -118,10 +118,12 @@ else
TYPE_STR=
endif
-ifeq ($(FLAVOR),smp)
-FLAVOR_STR=.smp
-else
+FLAVOR=$(DEFAULT_FLAVOR)
+
+ifeq ($(FLAVOR),plain)
FLAVOR_STR=
+else
+FLAVOR_STR=.smp
endif
ifeq ($(XCOMP),yes)