# HG changeset patch # User John W. Eaton # Date 1354661996 18000 # Node ID 558397d29e38bed8670d61ebb730c1aabfac247a # Parent 2784771bed32fd58ff4a74c21bb3a02d1875a80e# Parent 71294b7ce7827da410dc3db26777886a206cfb77 merge stable to default diff --git a/src/qhull.mk b/src/qhull.mk --- a/src/qhull.mk +++ b/src/qhull.mk @@ -26,7 +26,7 @@ if [ $(BUILD_SHARED) = yes ]; then \ $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin'; \ - $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-g++' '$(PREFIX)/$(TARGET)/lib/libqhull.a'; \ + $(MAKE_SHARED_FROM_STATIC) --ar '$(TARGET)-ar' --ld '$(TARGET)-gcc' '$(PREFIX)/$(TARGET)/lib/libqhull.a'; \ $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libqhull.dll.a' '$(PREFIX)/$(TARGET)/lib/libqhull.dll.a'; \ $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/libqhull.dll' '$(PREFIX)/$(TARGET)/bin/libqhull.dll'; \ rm -f '$(PREFIX)/$(TARGET)/lib/libqhull.dll'; \