Remove shell-specific code from TestLoadUnload Makefile.

[clayborg]

Use the $(DS) variable and this will be good go.

test/functionalities/load_unload/Makefile

28

I believe our base makefile rules have a variable names $(DS) so this should probably be:

DS_IF_DARWIN = $(DS) -o $@.dSYM $@

[chaoren]

• Use $(DS) variable.

[chaoren]

test/functionalities/load_unload/Makefile

28

I don't think this test loads the base makefile rules.

[chaoren]

• Added back the $(DS) variable since we don't source the base Makefile.

[clayborg]

Looks good.

[clayborg]

The eventual and correct fix it to source the main makefile rules and use the DYLIB_* make variables for LIB_A, and make equivalent DYLIB2_*, DYLIB3_*, DYLIB4_* variables which would allow the top level makefile rules to compile up to 4 shared libraries in one makefile and then use those for LIB_B, LIB_C and LIB_D.

test/functionalities/load_unload/Makefile

 CC ?= clang
 ifeq "$(ARCH)" ""
   ARCH = x86_64
 endif
 
 ifeq "$(OS)" ""
   OS = $(shell uname -s)
 endif
 
 CFLAGS ?= -g -O0
 CWD := $(shell pwd)
 
 LIB_PREFIX := libloadunload_
 
 ifeq "$(OS)" "Darwin"
   CFLAGS += -arch $(ARCH)
-  DS := dsymutil
   LD_FLAGS := -dynamiclib
   LIB_A := $(LIB_PREFIX)a.dylib
   LIB_B := $(LIB_PREFIX)b.dylib
   LIB_C := $(LIB_PREFIX)c.dylib
   LIB_D := $(LIB_PREFIX)d.dylib
   EXEC_PATH := "@executable_path"
   EXEC_PATH_A := -install_name $(EXEC_PATH)/$(LIB_A)
   EXEC_PATH_B := -install_name $(EXEC_PATH)/$(LIB_B)
   EXEC_PATH_C := -install_name $(EXEC_PATH)/$(LIB_C)
   EXEC_PATH_D := -install_name $(CWD)/$(LIB_D)
+
+  DS_IF_DARWIN = dsymutil -o $@.dSYM $@
 else
   CFLAGS += -fPIC
   LD_FLAGS := -shared
   LIB_DL := -ldl
   LIB_A := $(LIB_PREFIX)a.so
   LIB_B := $(LIB_PREFIX)b.so
   LIB_C := $(LIB_PREFIX)c.so
   LIB_D := $(LIB_PREFIX)d.so
 endif
 
 all: a.out $(LIB_A) $(LIB_B) $(LIB_C) $(LIB_D) hidden/$(LIB_D)
 
 a.out: main.o $(LIB_D)
   $(CC) $(CFLAGS) -o a.out main.o -L. -pie -lloadunload_d $(LIB_DL)
 
 main.o: main.c
   $(CC) $(CFLAGS) -c main.c
 
 hidden/$(LIB_D): dh.o
   $(CC) $(CFLAGS) $(LD_FLAGS) -o hidden/$(LIB_D) dh.o
-  if [ "$(OS)" = "Darwin" ]; then dsymutil -o hidden/$(LIB_D).dSYM hidden/$(LIB_D); fi
+  $(DS_IF_DARWIN)
 
 $(LIB_A): a.o $(LIB_B)
   $(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_A) -o $(LIB_A) a.o -L. -lloadunload_b
-  if [ "$(OS)" = "Darwin" ]; then dsymutil $(LIB_A); fi
+  $(DS_IF_DARWIN)
 
 a.o: a.c
   $(CC) $(CFLAGS) -c a.c
 
 $(LIB_B): b.o
   $(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_B) -o $(LIB_B) b.o
-  if [ "$(OS)" = "Darwin" ]; then dsymutil $(LIB_B); fi
+  $(DS_IF_DARWIN)
 
 b.o: b.c
   $(CC) $(CFLAGS) -c b.c
 
 $(LIB_C): c.o
   $(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_C) -o $(LIB_C) c.o
-  if [ "$(OS)" = "Darwin" ]; then dsymutil $(LIB_C); fi
+  $(DS_IF_DARWIN)
 
 c.o: c.c
   $(CC) $(CFLAGS) -c c.c
 
 $(LIB_D): d.o
   $(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_D) -o $(LIB_D) d.o
-  if [ "$(OS)" = "Darwin" ]; then dsymutil $(LIB_D); fi
+  $(DS_IF_DARWIN)
 
 d.o: d.c
   $(CC) $(CFLAGS) -c d.c
 
 dh.o: d.c
   $(CC) $(CFLAGS) -DHIDDEN -c d.c -o dh.o
 
 clean:
   rm -rf $(wildcard *.o *~ *.dylib *.so a.out *.dSYM hidden/*)