Remove unused variables from Makefile

Make automatically provides CXX and CC, and these manual
definitions were being ignored.

Also fix a missing space in one of the messages from the tests.

2 files changed, 2 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 0d9b9f6..5af440e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
-CC = gcc
-CXX = g++
+# Note that CXX and CC are predefined as g++ and cc (respectively) by Make
 NVCC ?= nvcc
 # -fPIC is needed in all cases, as we may be linked into another shared library
 CFLAGS = -fPIC
diff --git a/libsmctrl_test_mask_shared.cu b/libsmctrl_test_mask_shared.cu
index f3e8933..e4ddde7 100644
--- a/libsmctrl_test_mask_shared.cu
+++ b/libsmctrl_test_mask_shared.cu
@@ -126,7 +126,7 @@ int test_constrained_size_and_location(enum partitioning_type part_type) {
     if (smids_partitioned_h[NUM_BLOCKS - 1] > (enabled_tpc * sms_per_tpc) + sms_per_tpc - 1 ||
         smids_partitioned_h[NUM_BLOCKS - 1] < (enabled_tpc * sms_per_tpc)) {
       printf("%s: ***Test failure.***\n"
-             "%s: Reason: With TPC mask set to"
+             "%s: Reason: With TPC mask set to "
              "constrain all kernels to TPC %d, a kernel was run and found "
              "to run on an SM IDs: as high as %d and as low as %d (range of %d to %d expected).\n",
              program_invocation_name, program_invocation_name, enabled_tpc, smids_partitioned_h[NUM_BLOCKS - 1], smids_partitioned_h[0], enabled_tpc * sms_per_tpc + sms_per_tpc - 1, enabled_tpc * sms_per_tpc);