diff --git a/contrib/filterArgs.sh b/contrib/filterArgs.sh new file mode 100755 index 0000000000000..584326607e9d7 --- /dev/null +++ b/contrib/filterArgs.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# Loop over all command line arguments +for i in "$@"; do + # If an argument starts with -L, echo it out sans -L! + if [[ $i == -L* ]]; then + echo "\"${i:2:${#i}}\"" + fi +done diff --git a/contrib/repackage_system_suitesparse3.make b/contrib/repackage_system_suitesparse3.make index 41a9a2e17f5df..5700e3d935b63 100755 --- a/contrib/repackage_system_suitesparse3.make +++ b/contrib/repackage_system_suitesparse3.make @@ -10,7 +10,7 @@ default: mkdir -p $(JULIAHOME)/deps/SuiteSparse-SYSTEM/lib cd $(JULIAHOME)/deps/SuiteSparse-SYSTEM/lib && \ rm -f *.a && \ - cp -f `find /lib /usr/lib /usr/local/lib $(subst -L,,$(LDFLAGS)) -name libamd.a -o -name libcolamd.a -o -name libcholmod.a -o -name libumfpack.a 2>/dev/null` . && \ + cp -f $(shell find /lib /usr/lib /usr/local/lib $(shell eval $(JULIAHOME)/contrib/filterArgs.sh $(LDFLAGS)) -name libamd.a -o -name libcolamd.a -o -name libcholmod.a -o -name libumfpack.a 2>/dev/null) . && \ $(CC) -shared $(WHOLE_ARCHIVE) libamd.a $(NO_WHOLE_ARCHIVE) -o $(USRLIB)/libamd.$(SHLIB_EXT) && \ $(INSTALL_NAME_CMD)libamd.$(SHLIB_EXT) $(USRLIB)/libamd.$(SHLIB_EXT) && \ $(CC) -shared $(WHOLE_ARCHIVE) libcolamd.a $(NO_WHOLE_ARCHIVE) -o $(USRLIB)/libcolamd.$(SHLIB_EXT) && \ diff --git a/contrib/repackage_system_suitesparse4.make b/contrib/repackage_system_suitesparse4.make index 106595a3ab3ba..c2b7d723e97e7 100755 --- a/contrib/repackage_system_suitesparse4.make +++ b/contrib/repackage_system_suitesparse4.make @@ -10,7 +10,7 @@ default: mkdir -p $(JULIAHOME)/deps/SuiteSparse-SYSTEM/lib cd $(JULIAHOME)/deps/SuiteSparse-SYSTEM/lib && \ rm -f *.a && \ - cp -f `find /lib /usr/lib /usr/local/lib $(subst -L,,$(LDFLAGS)) -name libamd.a -o -name libcolamd.a -o -name libcholmod.a -o -name libumfpack.a -o -name libsuitesparseconfig.a 2>/dev/null` . && \ + cp -f $(shell find /lib /usr/lib /usr/local/lib $(shell eval $(JULIAHOME)/contrib/filterArgs.sh $(LDFLAGS)) -name libamd.a -o -name libcolamd.a -o -name libcholmod.a -o -name libumfpack.a -o -name libsuitesparseconfig.a 2>/dev/null) . && \ $(CC) -shared $(WHOLE_ARCHIVE) libamd.a $(NO_WHOLE_ARCHIVE) -o $(USRLIB)/libamd.$(SHLIB_EXT) && \ $(INSTALL_NAME_CMD)libamd.$(SHLIB_EXT) $(USRLIB)/libamd.$(SHLIB_EXT) && \ $(CC) -shared $(WHOLE_ARCHIVE) libcolamd.a $(NO_WHOLE_ARCHIVE) -o $(USRLIB)/libcolamd.$(SHLIB_EXT) && \