This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 255959
Collapse All | Expand All

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/LinkerConfiguration.java (+4 lines)
Lines 90-95 Link Here
90
        output = new StringConfiguration(null, ""); // NOI18N
90
        output = new StringConfiguration(null, ""); // NOI18N
91
        additionalLibs = new VectorConfiguration<>(null);
91
        additionalLibs = new VectorConfiguration<>(null);
92
        dynamicSearch = new VectorConfiguration<>(null);
92
        dynamicSearch = new VectorConfiguration<>(null);
93
93
        stripOption = new BooleanConfiguration(false); // NOI18N
94
        stripOption = new BooleanConfiguration(false); // NOI18N
94
        picOption = new BooleanConfiguration(true); // NOI18N
95
        picOption = new BooleanConfiguration(true); // NOI18N
95
        norunpathOption = new BooleanConfiguration(true); // NOI18N
96
        norunpathOption = new BooleanConfiguration(true); // NOI18N
Lines 101-106 Link Here
101
        
102
        
102
        boolean isMac = makeConfiguration.getDevelopmentHost().getBuildPlatform() == PlatformTypes.PLATFORM_MACOSX;
103
        boolean isMac = makeConfiguration.getDevelopmentHost().getBuildPlatform() == PlatformTypes.PLATFORM_MACOSX;
103
        copyLibrariesConfiguration = new BooleanConfiguration(isMac);
104
        copyLibrariesConfiguration = new BooleanConfiguration(isMac);
105
        if (isMac) {
106
            dynamicSearch.add(".");
107
        }
104
        
108
        
105
        tool = new StringConfiguration(null, ""); // NOI18N
109
        tool = new StringConfiguration(null, ""); // NOI18N
106
        runTimeSearchPath = new IntConfiguration(null, SEARCH_PATH_RELATIVE_TO_WORKING_DIR, SEARCH_PATH_NAMES, null);
110
        runTimeSearchPath = new IntConfiguration(null, SEARCH_PATH_RELATIVE_TO_WORKING_DIR, SEARCH_PATH_NAMES, null);
(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java (-1 / +1 lines)
Lines 557-563 Link Here
557
//        if (conf.isLinkerConfiguration() && conf.getLinkerConfiguration().getCopyLibrariesConfiguration().getValue()) {
557
//        if (conf.isLinkerConfiguration() && conf.getLinkerConfiguration().getCopyLibrariesConfiguration().getValue()) {
558
//            explicitDot = " -L. -L${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}";
558
//            explicitDot = " -L. -L${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}";
559
//        }
559
//        }
560
        bw.write("LDLIBSOPTIONS=-Wl,-rpath,'.' " + oicLibOptionsPrefix + conf.getLinkerConfiguration().getLibraryItems() + oicLibOptionsPostfix + explicitDot + "\n"); // NOI18N
560
        bw.write("LDLIBSOPTIONS=" + oicLibOptionsPrefix + conf.getLinkerConfiguration().getLibraryItems() + oicLibOptionsPostfix + explicitDot + "\n"); // NOI18N
561
        bw.write("\n"); // NOI18N
561
        bw.write("\n"); // NOI18N
562
562
563
        if (conf.isQmakeConfiguration()) {
563
        if (conf.isQmakeConfiguration()) {

Return to bug 255959